commit 668d7a11bb83fcb087d5b7d8e320a82b3511fc47
author Rico Wind <ricow@google.com> Tue Oct 08 09:33:07 2019 +0200
committer Rico Wind <ricow@google.com> Tue Oct 08 09:33:07 2019 +0200
tree 2d0d12f3a662dda975105aa423f7b22e8ff028a9
parent b631f24e1a1ecda768fabc2c7b51635d92a93938

Update D8 and R8 to 1.7.7-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I32f659021ca28aa28db0ade2544c2254eb684217

compatdx-master.jar

diff --git a/compatdx-master.jar b/compatdx-master.jar
index 8661bfe..e886529 100644
--- a/compatdx-master.jar
+++ b/compatdx-master.jar
Binary files differ

compatdx-master.jar.map

diff --git a/compatdx-master.jar.map b/compatdx-master.jar.map
index 3a5e9a2..fb86228 100644
--- a/compatdx-master.jar.map
+++ b/compatdx-master.jar.map
@@ -1,17 +1,17 @@
 # compiler: R8
-# compiler_version: 1.7.6-dev
+# compiler_version: 1.7.7-dev
 # compiler_hash: engineering
-# pg_map_id: c3a1efe
+# pg_map_id: 7be1a14
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:15 -> <init>
     1:1:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:21 -> a
-    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     2:2:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
     3:7:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24:28 -> a
-    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     8:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
 com.android.tools.r8.ArchiveClassFileProvider -> com.android.tools.r8.ArchiveClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
@@ -226,7 +226,7 @@
     1:1:boolean isMinApiLevelSet():390:390 -> getMinApiLevel
     1:1:int getMinApiLevel():386 -> getMinApiLevel
     2:2:int getMinApiLevel():386:386 -> getMinApiLevel
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> getMinApiLevel
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> getMinApiLevel
     3:3:int getMinApiLevel():386 -> getMinApiLevel
     4:4:int getMinApiLevel():386:386 -> getMinApiLevel
     1:1:com.android.tools.r8.CompilationMode getMode():190:190 -> getMode
@@ -344,7 +344,7 @@
     1:1:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> a
     1:1:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):136 -> a
     2:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):137:137 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    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 runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):137 -> a
     4:6:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):82:84 -> a
     7:18:void run(java.lang.String[]):107:118 -> a
@@ -352,7 +352,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):356:356 -> 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):363:363 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +361,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):352:352 -> d
+    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -378,10 +378,10 @@
     3:3:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> run
     3:3:void run(com.android.tools.r8.D8Command):77 -> run
     4:4:void run(com.android.tools.r8.D8Command):79:79 -> run
-    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
+    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     5:5:void run(com.android.tools.r8.D8Command):78 -> run
     6:9:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):97:100 -> run
-    10:10:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
+    10:10:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     10:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):99 -> run
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> s
@@ -440,7 +440,7 @@
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:82:void <clinit>():26:107 -> <clinit>
-    83:83:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> <clinit>
+    83:83:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> <clinit>
     83:83:void <clinit>():121 -> <clinit>
     84:84:void <clinit>():121:121 -> <clinit>
     85:85:void <clinit>():110:110 -> <clinit>
@@ -555,7 +555,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(java.util.Map):32:33 -> <init>
     1:2:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):62:63 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    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):63 -> a
     4:4:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):65:65 -> a
     5:15:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):74:84 -> a
@@ -715,13 +715,13 @@
     2:3:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):127:128 -> a
     4:4:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> a
     4:4:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     5:5:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> a
     5:5:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
     6:6:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130:130 -> a
     7:7:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> a
     7:7:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
-    8:8:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    8:8:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     8:8:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> a
     8:8:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
     9:19:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):131:141 -> a
@@ -862,7 +862,7 @@
     2:2:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):124 -> run
     3:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):126:128 -> run
     6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):147:151 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> run
     11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):150 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):159:159 -> run
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
@@ -920,23 +920,24 @@
 com.android.tools.r8.GeneratedOutlineSupport -> com.android.tools.r8.k:
     long outline0(long,long,long) -> a
     com.android.tools.r8.errors.Unreachable outline1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.StringDiagnostic) -> a
-    java.lang.StringBuilder outline10(java.lang.String) -> a
-    java.lang.StringBuilder outline11(java.lang.String,int,java.lang.String) -> a
+    java.lang.StringBuilder outline10(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.StringBuilder outline11(java.lang.String) -> a
+    java.lang.StringBuilder outline12(java.lang.String,int,java.lang.String) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
-    java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
-    java.lang.String outline4(java.lang.String,int) -> a
-    java.lang.String outline6(java.lang.String,java.lang.String) -> a
-    java.lang.String outline7(java.lang.StringBuilder,int,java.lang.String) -> a
-    java.lang.String outline8(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
-    java.lang.String outline5(java.lang.String,int,java.lang.String) -> b
-    java.lang.StringBuilder outline9(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
+    java.lang.String outline5(java.lang.String,int) -> a
+    java.lang.String outline7(java.lang.String,java.lang.String) -> a
+    java.lang.String outline8(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.String outline4(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    java.lang.String outline6(java.lang.String,int,java.lang.String) -> b
 com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.l:
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87:87 -> a
-    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87 -> a
     3:10:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:100 -> a
     11:11:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:106 -> a
@@ -946,12 +947,12 @@
     12:12:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     13:27:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:123 -> a
     13:27:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):347:347 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):354:354 -> a
     28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
     28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
     29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
     42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -993,33 +994,33 @@
     3:3:void <init>():158:158 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):162:162 -> <init>
     5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):154:155 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):189:189 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):195:195 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():227:231 -> c
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):194:194 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):182:182 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):188:188 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():220:224 -> c
     1:5:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():232 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():225 -> c
     6:6:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    7:63:com.android.tools.r8.L8Command makeCommand():232:288 -> c
+    7:63:com.android.tools.r8.L8Command makeCommand():225:281 -> c
     7:63:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    64:64:com.android.tools.r8.L8Command makeCommand():228:228 -> c
+    64:64:com.android.tools.r8.L8Command makeCommand():221:221 -> c
     64:64:com.android.tools.r8.BaseCommand makeCommand():151 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():207:222 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> f
-    1:2:boolean isShrinking():167:168 -> isShrinking
+    1:16:void validate():200:215 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> f
+    1:1:boolean isShrinking():167:167 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
     1:1:void <init>():79:79 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):83:87 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):85:91 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():294:296 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:304 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):303:303 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:302 -> accept
-    1:1:java.util.Collection getProgramResources():309:309 -> getProgramResources
+    1:3:void <init>():287:289 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:297 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):296:296 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:295 -> accept
+    1:1:java.util.Collection getProgramResources():302:302 -> getProgramResources
 com.android.tools.r8.OptionalBool -> com.android.tools.r8.p:
     com.android.tools.r8.OptionalBool TRUE -> a
     com.android.tools.r8.OptionalBool FALSE -> b
@@ -1093,14 +1094,14 @@
     1:1:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> a
     1:1:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):225 -> a
     2:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226:226 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> a
+    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> a
     4:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):179:179 -> a
     5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
     17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):150:150 -> a
@@ -1135,60 +1136,60 @@
     512:512:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):645:645 -> a
     513:529:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):642:658 -> a
     530:585:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):657:712 -> a
-    586:676:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:801 -> a
-    677:702:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:775 -> a
-    703:721:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):771:789 -> a
-    722:739:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):784:801 -> a
-    740:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
-    741:741:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
-    742:1168:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:801 -> a
-    1169:1170:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
-    1171:1171:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
-    1172:1176:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
-    1177:1179:void lambda$run$4(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):586:588 -> a
-    1180:1180:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
-    1181:1181:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
-    1182:1182:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
-    1183:1183:void lambda$run$9(java.lang.String):744:744 -> a
-    1184:1184:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
-    1185:1185:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
-    1186:1188: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):818:820 -> a
-    1189:1211: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):819:841 -> a
-    1212:1223: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):839:850 -> a
-    1224:1228: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):849:853 -> a
-    1229:1234: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:856 -> a
-    1235:1235:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1235:1235: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):856 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1236: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):856 -> a
-    1237:1237: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):856:856 -> a
-    1238:1241:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):860:863 -> a
-    1242:1242:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):882:882 -> a
-    1243:1243:void lambda$main$13(java.lang.String[]):898:898 -> a
+    586:680:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:805 -> a
+    681:710:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:779 -> a
+    711:729:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):775:793 -> a
+    730:747:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):788:805 -> a
+    748:748:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
+    749:749:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
+    750:1180:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:805 -> a
+    1181:1182:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
+    1183:1183:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
+    1184:1188:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
+    1189:1191:void lambda$run$4(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):586:588 -> a
+    1192:1192:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
+    1193:1193:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
+    1194:1194:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
+    1195:1195:void lambda$run$9(java.lang.String):744:744 -> a
+    1196:1196:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
+    1197:1197:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
+    1198:1200: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):822:824 -> a
+    1201:1223: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):823:845 -> a
+    1224:1235:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):843:854 -> a
+    1236: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):853:857 -> a
+    1241:1246: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):855:860 -> a
+    1247:1247:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1247:1247: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):860 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1248: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):860 -> a
+    1249:1249: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):860:860 -> a
+    1250:1253:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):864:867 -> a
+    1254:1254:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):886:886 -> a
+    1255:1255:void lambda$main$13(java.lang.String[]):902:902 -> 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):230:232 -> b
-    4:5:void run(java.lang.String[]):868:869 -> b
+    4:5:void run(java.lang.String[]):872:873 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):870 -> b
-    7:7:void run(java.lang.String[]):871:871 -> b
+    6:6:void run(java.lang.String[]):874 -> b
+    7:7:void run(java.lang.String[]):875:875 -> 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[]):870 -> b
-    9:13:void run(java.lang.String[]):874:878 -> b
+    8:8:void run(java.lang.String[]):874 -> b
+    9:13:void run(java.lang.String[]):878:882 -> b
     14:14:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> b
-    14:14:void run(java.lang.String[]):879 -> b
-    15:15:void run(java.lang.String[]):881:881 -> b
-    16:16:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> b
-    16:16:void run(java.lang.String[]):881 -> b
-    17:17:void run(java.lang.String[]):884:884 -> b
+    14:14:void run(java.lang.String[]):883 -> b
+    15:15:void run(java.lang.String[]):885:885 -> b
+    16:16:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> b
+    16:16:void run(java.lang.String[]):885 -> b
+    17:17:void run(java.lang.String[]):888:888 -> b
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):239:239 -> c
-    1:5:void main(java.lang.String[]):894:898 -> main
+    1:5:void main(java.lang.String[]):898:902 -> main
     1:3:void run(com.android.tools.r8.R8Command):158:160 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):174:177 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> 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):176 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.util.List mainDexKeepRules -> o
@@ -1224,7 +1225,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():825:835 -> c
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():832:842 -> c
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():839:856 -> c
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():857 -> c
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():858:872 -> c
     1:1:boolean getEnableMinification():764:764 -> getEnableMinification
@@ -1338,7 +1339,7 @@
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:31:void <clinit>():18:48 -> <clinit>
-    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> <clinit>
+    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> <clinit>
     32:32:void <clinit>():64 -> <clinit>
     33:33:void <clinit>():64:64 -> <clinit>
     34:34:void <clinit>():51:51 -> <clinit>
@@ -1688,14 +1689,14 @@
     211:212:void print(com.android.tools.r8.cf.code.CfFieldInstruction):452:453 -> a
     213:217:void appendDescriptor(com.android.tools.r8.graph.DexType):689:693 -> a
     213:217:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    218:218:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     218:218:void appendDescriptor(com.android.tools.r8.graph.DexType):693 -> a
     218:218:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
     219:219:void appendDescriptor(com.android.tools.r8.graph.DexType):693:693 -> a
     219:219:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
     220:222:void print(com.android.tools.r8.cf.code.CfNew):457:459 -> a
     223:224:void print(com.android.tools.r8.cf.code.CfNewArray):463:464 -> a
-    225:225:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    225:225:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     225:225:void print(com.android.tools.r8.cf.code.CfNewArray):464 -> a
     226:230:void print(com.android.tools.r8.cf.code.CfNewArray):464:468 -> a
     231:231:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -1970,16 +1971,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):115:115 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:123 -> <init>
     1:8:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:134 -> a
-    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> a
     9:9:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):136 -> a
     10:12:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):137:139 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():197:197 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():200:200 -> a
     13:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():201:201 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():204:204 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():205:205 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():208:208 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
-    16:16:boolean com.android.tools.r8.graph.DexType.isIntType():209:209 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isIntType():212:212 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143 -> a
     17:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
     23:26:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):148:151 -> a
@@ -2006,13 +2007,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2032,7 +2033,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():56 -> toString
 com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.x.i:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
@@ -2375,7 +2376,7 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():116:116 -> g
     1:1:java.lang.String toString():90:90 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():90 -> toString
 com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.x.m.s:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
@@ -8472,7 +8473,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.z.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -12784,24 +12786,24 @@
     70:74:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):139:143 -> a
     75:76:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):164:165 -> a
     75:76:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    77:77:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> a
+    77:77:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> a
     77:77:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):165 -> a
     77:77:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
     78:78:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):165:165 -> a
     78:78:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    79:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):68:78 -> a
+    79:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):77:87 -> a
     79:89:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     79:89:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):76:76 -> a
+    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
     90:90:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     90:90:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    91:91:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):74:74 -> a
+    91:91:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
     91:91:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     91:91:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    92:92:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):72:72 -> a
+    92:92:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
     92:92:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     92:92:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    93:93:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):70:70 -> a
+    93:93:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:79 -> a
     93:93:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     93:93:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
     94:97:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167:170 -> a
@@ -12838,7 +12840,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12906,10 +12908,10 @@
     157:165:void write(java.util.concurrent.ExecutorService):358:366 -> a
     166:166:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):294:294 -> a
     167:171:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):305:309 -> a
-    172:172:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> a
+    172:172:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> a
     172:172:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):309 -> a
     173:180:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):312:319 -> a
-    181:181:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():333:333 -> a
+    181:181:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():334:334 -> a
     181:181:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):319 -> a
     182:185:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:326 -> a
     186:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):325:325 -> a
@@ -12979,10 +12981,10 @@
     481:481:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638:638 -> a
     482:487:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):634:639 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189:189 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():325:325 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():326:326 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:201 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
@@ -13054,7 +13056,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13394,7 +13396,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -14175,7 +14177,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -15148,7 +15150,7 @@
     4:4:void commitTransaction():230:230 -> a
     4:4:void injectString(com.android.tools.r8.graph.DexString):147 -> a
     5:5:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
-    6:6:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    6:6:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     6:6:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):156 -> a
     7:7:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):156:156 -> a
     8:8:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
@@ -15289,7 +15291,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> call
     8:8:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):899 -> call
     8:8:java.util.Map call():913 -> call
-    9:9:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> call
+    9:9:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> call
     9:9:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> call
     9:9:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):899 -> call
     9:9:java.util.Map call():913 -> call
@@ -15315,7 +15317,7 @@
     146:146:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> call
     146:146:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1016 -> call
     146:146:java.util.Map call():993 -> call
-    147:147:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> call
+    147:147:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> call
     147:147:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> call
     147:147:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1016 -> call
     147:147:java.util.Map call():993 -> call
@@ -15736,13 +15738,13 @@
     2:13:void <init>(java.util.List,com.android.tools.r8.utils.Reporter):31:42 -> <init>
     14:19:void <init>(java.util.List,com.android.tools.r8.utils.Reporter):41:46 -> <init>
     1:4:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):54:57 -> a
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     5:5:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):58 -> a
     6:9:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):58:61 -> a
     10:10:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):61:61 -> a
     11:26:java.util.Collection getDataResourceProvidersAndConsumers():87:102 -> a
     27:27:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
-    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     28:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):112 -> a
     29:29:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
     29:29:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):112 -> a
@@ -15750,7 +15752,7 @@
     31:31:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116:116 -> a
     32:37:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):120:125 -> a
     32:37:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
-    38:38:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    38:38:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     38:38:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126 -> a
     38:38:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     39:39:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -15758,7 +15760,7 @@
     39:39:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     40:40:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:125 -> a
     40:40:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
-    41:41:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    41:41:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     42:42:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -15884,7 +15886,7 @@
     77:77:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
     77:77:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612 -> a
     78:78:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):640:640 -> a
-    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     79:79:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96 -> a
     80:80:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():70:71 -> b
@@ -15947,92 +15949,97 @@
     1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):654:661 -> a
     9:12:com.android.tools.r8.graph.ResolutionResult build():666:669 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.C.f:
+    boolean $assertionsDisabled -> m
     java.util.Set missingClasses -> g
-    boolean $assertionsDisabled -> l
     java.util.Map supertypesForSynthesizedClasses -> i
     java.util.Map typeInfo -> j
-    java.util.Set NO_DIRECT_SUBTYPE -> k
+    java.util.Map mayHaveFinalizeMethodDirectlyOrIndirectlyCache -> k
+    java.util.Set NO_DIRECT_SUBTYPE -> l
     java.util.Map subtypeMap -> h
     1:8:void <clinit>():27:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):127:127 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexApplication):114:130 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):134:134 -> <init>
-    20:44:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):114:138 -> <init>
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):143:164 -> a
-    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):213:236 -> a
-    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):242:250 -> a
-    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):255:289 -> a
-    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250 -> a
-    91:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):319:324 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> a
+    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    91:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:330 -> a
     97:97:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> a
-    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:331 -> a
     99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> a
-    100:100:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> a
+    100:100:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:331 -> a
     101:120:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):203:222 -> a
-    101:120:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):327 -> a
-    121:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):349:355 -> a
+    101:120:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):333 -> a
+    121:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> a
     128:128:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    128:128:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355 -> a
-    129:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> a
-    136:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):383:393 -> a
-    147:147:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> a
-    147:147:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393 -> a
-    148:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):404:413 -> a
+    128:128:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361 -> a
+    129:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361:367 -> a
+    136:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):389:399 -> a
+    147:147:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    147:147:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):399 -> a
+    148:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):410:419 -> a
     158:158:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    158:158:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):413 -> a
-    159:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):414:417 -> a
-    163:163:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):386:386 -> a
-    164:167:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):424:427 -> a
-    168:170:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):432:434 -> a
-    171:186:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):496:511 -> a
-    187:196:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):532:541 -> a
-    197:209:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):617:629 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):199:202 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):655:703 -> b
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):709:709 -> c
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):556:564 -> d
-    10:12:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:647 -> d
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479:482 -> e
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> e
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):483 -> e
-    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):580:584 -> e
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):450:450 -> f
-    2:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):468:471 -> f
-    6:8:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> f
-    6:8:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):472 -> f
-    1:10:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:524 -> g
-    11:14:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):634:637 -> g
-    15:15:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    15:15:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
-    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    16:16:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    17:17:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637:637 -> g
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):331:331 -> h
-    2:2:boolean hasSubtyping():439:439 -> h
-    3:3:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):509:509 -> h
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):463:463 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):602:613 -> j
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):612:612 -> j
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):458:458 -> k
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):588:588 -> l
+    158:158:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419 -> a
+    159:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):420:423 -> a
+    163:163:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):392:392 -> a
+    164:167:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):430:433 -> a
+    168:170:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):438:440 -> a
+    171:186:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):502:517 -> a
+    187:196:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):538:547 -> a
+    197:209:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):623:635 -> a
+    210:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):724:744 -> a
+    231:231:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):456:456 -> a
+    231:231:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):749 -> a
+    232:238:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):749:755 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):661:709 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):715:715 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):485:488 -> d
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):489 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):562:570 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):474:477 -> e
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):478 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):586:590 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):456:456 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):521:530 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:515 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):640:643 -> g
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643:643 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):337:337 -> h
+    2:2:boolean hasSubtyping():445:445 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):469:469 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):608:619 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):618:618 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):464:464 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594:594 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):589 -> l
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():445:445 -> m
-    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):597:597 -> m
-    1:2:java.util.Set getMissingClasses():185:186 -> n
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):454:454 -> n
-    4:4:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> n
-    4:4:boolean isUnknown(com.android.tools.r8.graph.DexType):454 -> n
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595 -> l
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():451:451 -> m
+    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):603:603 -> m
+    1:2:java.util.Set getMissingClasses():191:192 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):460:460 -> n
+    4:4:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    4:4:boolean isUnknown(com.android.tools.r8.graph.DexType):460 -> n
     1:1:java.util.Set access$000():27:27 -> o
-    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):190:193 -> o
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):208:208 -> p
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):559:559 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):562:562 -> r
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):582:582 -> s
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):199:199 -> t
+    2:2:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):719:719 -> o
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
+    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):565:565 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):568:568 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):588:588 -> t
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
@@ -16040,16 +16047,17 @@
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
     1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):49:49 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):39:50 -> <init>
-    1:11:void setLevel(int):65:75 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):80:83 -> a
-    16:18:boolean isInterface():95:97 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):107:109 -> a
-    1:1:void tagAsInteface():91:91 -> b
-    1:1:void tagAsSubtypeRoot():87:87 -> c
-    1:2:void ensureDirectSubTypeSet():59:60 -> d
-    1:1:java.lang.String toString():55:55 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.C.i:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -16096,7 +16104,7 @@
     38:47:boolean lambda$readServiceImplementationsForService$2(com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):193:202 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):209:210 -> b
     1:6:void visit(com.android.tools.r8.DataEntryResource):157:162 -> visit
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16124,7 +16132,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):70:70 -> <init>
     2:42:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48:88 -> <init>
     1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93:93 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):61 -> a
     2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93 -> a
     3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):62:62 -> a
@@ -16234,20 +16242,22 @@
     3:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:58 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
 com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.C.o:
+    boolean $assertionsDisabled -> b
     int hash -> a
+    1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>():9:13 -> <init>
     boolean computeEquals(java.lang.Object) -> b
-    1:1:boolean equals(java.lang.Object):40:40 -> equals
+    1:1:boolean equals(java.lang.Object):42:42 -> equals
     int computeHashCode() -> h
-    1:7:int hashCode():21:27 -> hashCode
+    1:10:int hashCode():21:30 -> hashCode
 com.android.tools.r8.graph.CfCode -> com.android.tools.r8.C.q:
-    java.util.List tryCatchRanges -> f
-    java.util.List instructions -> e
-    com.android.tools.r8.graph.DexType originalHolder -> b
-    int maxLocals -> d
-    boolean $assertionsDisabled -> h
-    java.util.List localVariables -> g
-    int maxStack -> c
+    boolean $assertionsDisabled -> i
+    java.util.List instructions -> f
+    com.android.tools.r8.graph.DexType originalHolder -> c
+    int maxStack -> d
+    java.util.List localVariables -> h
+    int maxLocals -> e
+    java.util.List tryCatchRanges -> g
     1:1:void <clinit>():39:39 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):105:111 -> <init>
     1:1:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):196:196 -> a
@@ -16466,6 +16476,7 @@
     boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
     boolean registerNewInstance(com.android.tools.r8.graph.DexType) -> c
+    boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> c
     boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
@@ -16534,7 +16545,7 @@
     150:150:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> a
     150:150:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):376 -> a
     151:151:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):376:376 -> a
-    152:152:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    152:152:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     152:152:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378 -> a
     153:154:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378:379 -> a
     155:161:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):385:391 -> a
@@ -16605,11 +16616,11 @@
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
 com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.F:
-    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> e
-    boolean $assertionsDisabled -> f
-    com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> d
-    int sorted -> c
-    com.android.tools.r8.graph.DexAnnotation[] annotations -> b
+    boolean $assertionsDisabled -> g
+    int sorted -> d
+    com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> e
+    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> f
+    com.android.tools.r8.graph.DexAnnotation[] annotations -> c
     1:6:void <clinit>():16:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):27:27 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
@@ -16617,7 +16628,7 @@
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:72 -> a
     5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
-    6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
     7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
     9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
@@ -16701,14 +16712,14 @@
     1:1:java.util.List getClasses():88:88 -> a
     1:3:boolean reorderClasses():80:82 -> b
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.J:
-    com.android.tools.r8.graph.DexString methodName -> d
-    int instructionOffset -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.graph.DexProto methodProto -> e
-    com.android.tools.r8.graph.DexEncodedArray encodedArray -> h
-    com.android.tools.r8.graph.DexMethod method -> i
-    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> f
-    java.util.List bootstrapArgs -> g
+    com.android.tools.r8.graph.DexString methodName -> e
+    com.android.tools.r8.graph.DexMethod method -> j
+    int instructionOffset -> k
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.graph.DexProto methodProto -> f
+    com.android.tools.r8.graph.DexEncodedArray encodedArray -> i
+    java.util.List bootstrapArgs -> h
+    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> g
     1:1:void <clinit>():24:24 -> <clinit>
     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>
@@ -16869,9 +16880,9 @@
     67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):580:581 -> a
     69:71:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):683:685 -> a
     72:78:boolean isResolvable(com.android.tools.r8.graph.AppView):709:715 -> a
-    79:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270:271 -> a
+    79:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276:277 -> a
     79:80:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
-    81:81:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270:270 -> a
+    81:81:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276:276 -> a
     81:81:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
     82:85:boolean isResolvable(com.android.tools.r8.graph.AppView):722:725 -> a
     86:93:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):742:749 -> a
@@ -16967,19 +16978,19 @@
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):70:70 -> b
     1:1:java.lang.String toString():64:64 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():64 -> toString
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.S:
-    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.code.Instruction[] instructions -> g
-    com.android.tools.r8.graph.DexString highestSortingString -> h
-    int outgoingRegisterSize -> d
-    int registerSize -> b
-    int incomingRegisterSize -> c
-    com.android.tools.r8.graph.DexCode$TryHandler[] handlers -> f
-    com.android.tools.r8.graph.DexCode$Try[] tries -> e
-    com.android.tools.r8.graph.DexDebugInfo debugInfo -> i
+    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.code.Instruction[] instructions -> h
+    com.android.tools.r8.graph.DexString highestSortingString -> i
+    int incomingRegisterSize -> d
+    com.android.tools.r8.graph.DexCode$TryHandler[] handlers -> g
+    int outgoingRegisterSize -> e
+    com.android.tools.r8.graph.DexDebugInfo debugInfo -> j
+    int registerSize -> c
+    com.android.tools.r8.graph.DexCode$Try[] tries -> f
     1:1:void <clinit>():33:33 -> <clinit>
     1:9:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):56:64 -> <init>
     1:3:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):104:106 -> a
@@ -17332,10 +17343,10 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
 com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.C.k0:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexDebugEvent[] events -> d
-    int startLine -> b
-    com.android.tools.r8.graph.DexString[] parameters -> c
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexDebugEvent[] events -> e
+    int startLine -> c
+    com.android.tools.r8.graph.DexString[] parameters -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):17:24 -> <init>
     1:5:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):28:32 -> a
@@ -17505,449 +17516,450 @@
     com.android.tools.r8.OptionalBool isLibraryMethodOverride -> k
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> n
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:46:void <clinit>():79:124 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):200:200 -> <init>
-    2:75: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):134:207 -> <init>
-    76:77: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):217:218 -> <init>
-    1:1:java.util.Map getParameterInfo():471:471 -> A
-    1:2:boolean hasAnnotation():1060:1061 -> B
-    1:2:boolean hasClassFileVersion():532:533 -> C
-    1:1:boolean hasCode():512:512 -> D
-    1:1:boolean hasParameterInfo():467:467 -> E
-    1:1:boolean isAbstract():247:247 -> F
+    1:46:void <clinit>():80:125 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):201:201 -> <init>
+    2:75: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):135:208 -> <init>
+    76:77: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):218:219 -> <init>
+    1:1:java.util.Map getParameterInfo():509:509 -> A
+    1:2:boolean hasAnnotation():1082:1083 -> B
+    1:2:boolean hasClassFileVersion():570:571 -> C
+    1:1:boolean hasCode():550:550 -> D
+    1:1:boolean hasParameterInfo():505:505 -> E
+    1:1:boolean isAbstract():248:248 -> F
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> F
-    2:2:boolean isAbstract():247 -> F
-    1:2:boolean isClassInitializer():270:271 -> G
+    2:2:boolean isAbstract():248 -> F
+    1:2:boolean isClassInitializer():271:272 -> G
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> G
-    3:3:boolean isClassInitializer():271 -> G
-    4:4:boolean isClassInitializer():271:271 -> G
+    3:3:boolean isClassInitializer():272 -> G
+    4:4:boolean isClassInitializer():272:272 -> G
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> G
-    5:5:boolean isClassInitializer():271 -> G
-    1:1:boolean isDefaultMethod():276:276 -> H
-    1:2:boolean isDirectMethod():321:322 -> I
+    5:5:boolean isClassInitializer():272 -> G
+    1:1:boolean isDefaultMethod():277:277 -> H
+    1:2:boolean isDirectMethod():322:323 -> I
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> I
-    3:3:boolean isDirectMethod():322 -> I
-    4:4:boolean isDirectMethod():322:322 -> I
+    3:3:boolean isDirectMethod():323 -> I
+    4:4:boolean isDirectMethod():323:323 -> I
     5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> I
-    5:5:boolean isDirectMethod():322 -> I
-    6:6:boolean isDirectMethod():322:322 -> I
+    5:5:boolean isDirectMethod():323 -> I
+    6:6:boolean isDirectMethod():323:323 -> I
     7:7:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> I
-    7:7:boolean isDirectMethod():322 -> I
-    1:1:boolean isFinal():251:251 -> J
+    7:7:boolean isDirectMethod():323 -> I
+    1:1:boolean isFinal():252:252 -> J
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> J
-    2:2:boolean isFinal():251 -> J
-    1:2:boolean isInitializer():255:256 -> K
-    1:2:boolean isInstanceInitializer():260:261 -> L
+    2:2:boolean isFinal():252 -> J
+    1:2:boolean isInitializer():256:257 -> K
+    1:2:boolean isInstanceInitializer():261:262 -> L
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> L
-    3:3:boolean isInstanceInitializer():261 -> L
-    4:4:boolean isInstanceInitializer():261:261 -> L
+    3:3:boolean isInstanceInitializer():262 -> L
+    4:4:boolean isInstanceInitializer():262:262 -> L
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> L
-    5:5:boolean isInstanceInitializer():261 -> L
-    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():222:222 -> M
-    1:2:boolean isNonAbstractNonNativeMethod():298:299 -> N
+    5:5:boolean isInstanceInitializer():262 -> L
+    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():223:223 -> M
+    1:2:boolean isNonAbstractNonNativeMethod():299:300 -> N
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> N
-    3:3:boolean isNonAbstractNonNativeMethod():299 -> N
-    4:4:boolean isNonAbstractNonNativeMethod():299:299 -> N
+    3:3:boolean isNonAbstractNonNativeMethod():300 -> N
+    4:4:boolean isNonAbstractNonNativeMethod():300:300 -> N
     5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> N
-    5:5:boolean isNonAbstractNonNativeMethod():299 -> N
-    1:2:boolean isNonAbstractVirtualMethod():293:294 -> O
+    5:5:boolean isNonAbstractNonNativeMethod():300 -> N
+    1:2:boolean isNonAbstractVirtualMethod():294:295 -> O
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> O
-    3:3:boolean isNonAbstractVirtualMethod():294 -> O
-    1:1:boolean isObsolete():159:159 -> P
-    1:1:boolean isOnlyInlinedIntoNestMembers():346:346 -> Q
-    1:2:boolean isPrivateMethod():313:314 -> R
+    3:3:boolean isNonAbstractVirtualMethod():295 -> O
+    1:1:boolean isObsolete():160:160 -> P
+    1:1:boolean isOnlyInlinedIntoNestMembers():347:347 -> Q
+    1:2:boolean isPrivateMethod():314:315 -> R
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> R
-    3:3:boolean isPrivateMethod():314 -> R
-    1:2:boolean isProcessed():242:243 -> S
-    1:2:boolean isPublicized():303:304 -> T
-    1:2:boolean isStatic():327:328 -> U
+    3:3:boolean isPrivateMethod():315 -> R
+    1:2:boolean isProcessed():243:244 -> S
+    1:2:boolean isPublicized():304:305 -> T
+    1:2:boolean isStatic():328:329 -> U
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> U
-    3:3:boolean isStatic():328 -> U
-    1:2:boolean isVirtualMethod():284:285 -> V
+    3:3:boolean isStatic():329 -> U
+    1:2:boolean isVirtualMethod():285:286 -> V
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> V
-    3:3:boolean isVirtualMethod():285 -> V
-    4:4:boolean isVirtualMethod():285:285 -> V
+    3:3:boolean isVirtualMethod():286 -> V
+    4:4:boolean isVirtualMethod():286:286 -> V
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> V
-    5:5:boolean isVirtualMethod():285 -> V
-    6:6:boolean isVirtualMethod():285:285 -> V
+    5:5:boolean isVirtualMethod():286 -> V
+    6:6:boolean isVirtualMethod():286:286 -> V
     7:7:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
-    7:7:boolean isVirtualMethod():285 -> V
-    1:2:void markNotProcessed():415:416 -> W
-    1:2:java.lang.String qualifiedName():544:545 -> X
-    1:2:void removeCode():521:522 -> Y
-    1:5:void setLibraryMethodOverride():226:230 -> Z
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):79:79 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):79:79 -> a
-    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):234:236 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    7:7:boolean isVirtualMethod():286 -> V
+    1:2:void markNotProcessed():453:454 -> W
+    1:2:java.lang.String qualifiedName():582:583 -> X
+    1:2:void removeCode():559:560 -> Y
+    1:5:void setLibraryMethodOverride():227:231 -> Z
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
+    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
-    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1294 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295:1295 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1316 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295 -> a
-    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295:1295 -> a
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
     10:10:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295 -> a
-    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1296:1296 -> a
-    12:13:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):351:352 -> a
-    14:39:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):357:382 -> a
-    40:40:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):380:380 -> a
-    41:41:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):378:378 -> a
-    42:42:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):376:376 -> a
-    43:62:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):389:408 -> a
-    63:63:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):405:405 -> a
-    64:64:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):402:402 -> a
-    65:65:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):399:399 -> a
-    66:66:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):396:396 -> a
-    67:85:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):393:411 -> a
-    86:87:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):420:421 -> a
-    88:89:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):430:431 -> a
-    90:90:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
-    90:90:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):431 -> a
-    91:91:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):434:434 -> a
-    92:92:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):432:432 -> a
-    93:96:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):439:442 -> a
-    97:97:boolean hasParameterInfo():467:467 -> a
-    97:97:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442 -> a
-    98:99:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442:443 -> a
-    100:101:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):462:463 -> a
-    100:101:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):443 -> a
-    102:102:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):445:445 -> a
-    103:105:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):449:451 -> a
-    106:107:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):483:484 -> a
-    108:108:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    108:108:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):484 -> a
-    109:110:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):485:486 -> a
-    111:111:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
-    111:111:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):486 -> a
-    112:112:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):488:488 -> a
-    113:113:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    113:113:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):488 -> a
-    114:114:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):489:489 -> a
-    115:115:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    115:115:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):489 -> a
-    116:116:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):494:494 -> a
-    117:122:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):499:504 -> a
-    123:131:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):554:562 -> a
-    132:137:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):566:571 -> a
-    138:138:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
-    138:138:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):571 -> a
-    139:140:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):571:572 -> a
-    141:141:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
-    141:141:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
-    141:141:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572 -> a
-    142:148:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572:578 -> a
-    149:157:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
-    149:157:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    158:158:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    158:158:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
-    158:158:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    159:160:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
-    159:160:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    161:161:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    161:161:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
-    161:161:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    162:162:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
-    162:162:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    163:163:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    163:163:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
-    163:163:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    164:169:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
-    164:169:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    170:170:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    170:170:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
-    170:170:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    171:174:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
-    171:174:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    175:175:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    175:175:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
-    175:175:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    176:182:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
-    176:182:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    183:183:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    183:183:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
-    183:183:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    184:185:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
-    184:185:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    186:186:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    186:186:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
-    186:186:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    187:190:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
-    187:190:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    191:191:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    191:191:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
-    191:191:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    192:213:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
-    192:213:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    214:217:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579:582 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
-    218:218:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572 -> a
-    219:219:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):609:609 -> a
-    220:220:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    220:220:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):610 -> a
-    221:223:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):611:613 -> a
-    224:224:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    224:224:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):613 -> a
-    225:229:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):614:618 -> a
-    230:231:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):673:674 -> a
-    232:233:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):693:694 -> a
-    232:233:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    234:234:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    234:234:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):694 -> a
-    234:234:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    235:237:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):695:697 -> a
-    235:237:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    238:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):696:700 -> a
-    238:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    243:243:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):703 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):703:703 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):702:702 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    246:246:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):704 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    247:250:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):705:708 -> a
-    247:250:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    251:266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):706:721 -> a
-    251:266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    267:267:void setObsolete():165:165 -> a
-    267:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):722 -> a
-    267:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):723:723 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    269:269:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676:676 -> a
-    270:271:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):727:728 -> a
-    270:271:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    272:272:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    272:272:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):728 -> a
-    272:272:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    273:275:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):729:731 -> a
-    273:275:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    276:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):730:732 -> a
-    276:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    279:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):733 -> a
-    279:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    280:284:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):734:738 -> a
-    280:284:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    285:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):735:743 -> a
-    285:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    294:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):740:740 -> a
-    294:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    295:295:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    295:295:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):744 -> a
-    295:295:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    296:299:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):745:748 -> a
-    296:299:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    300:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):746:750 -> a
-    300:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    305:305:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):750 -> a
-    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    306:307:boolean isStaticMember():333:334 -> a
-    306:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):751 -> a
-    306:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    308:330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):755:777 -> a
-    308:330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    331:331:void setObsolete():165:165 -> a
-    331:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778 -> a
-    331:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    332:332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:779 -> a
-    332:332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    333:337:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):681:685 -> a
-    338:342:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):684:688 -> a
-    343:343:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    343:343:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688 -> a
-    344:344:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688:688 -> a
-    345:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):783:784 -> a
-    347:361:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):788:802 -> a
-    362:362:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818:818 -> a
-    363:363:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    363:363:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818 -> a
-    364:380:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818:834 -> a
-    381:381:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    381:381:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):834 -> a
-    382:384:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):834:836 -> a
-    385:385:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    385:385:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):836 -> a
-    386:386:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837:837 -> a
-    387:387:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    387:387:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837 -> a
-    388:388:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838:838 -> a
-    389:389:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
-    389:389:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838 -> a
-    390:390:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):839:839 -> a
-    391:396:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):844:849 -> a
-    397:420:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):846:869 -> a
-    421:421:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):854:854 -> a
-    422:425:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):857:860 -> a
-    426:426:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    426:426:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    426:426:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    427:427:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    427:427:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    428:430:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):862:864 -> a
-    431:431:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    431:431:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864 -> a
-    432:433:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864:865 -> a
-    434:436:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):873:875 -> a
-    437:440:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):885:888 -> a
-    441:441:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    441:441:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):888 -> a
-    442:442:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):889:889 -> a
-    443:443:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> a
-    443:443:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):889 -> a
-    444:444:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):890:890 -> a
-    445:445:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    445:445:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):890 -> a
-    446:448:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):891:893 -> a
-    449:453:void lambda$toEmulateInterfaceLibraryMethod$3(com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):904:908 -> a
-    454:459:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):946:951 -> a
-    460:460:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
-    460:460:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
-    460:460:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):951 -> a
-    461:462:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):953:954 -> a
-    463:463:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    463:463:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):954 -> a
-    464:467:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):954:957 -> a
-    468:468:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    468:468:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):957 -> a
-    469:469:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):960:960 -> a
-    470:470:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
-    470:470:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):960 -> a
-    471:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:967 -> a
-    476:476:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):967 -> a
-    477:478:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):967:968 -> a
-    479:479:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    479:479:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968 -> a
-    480:494:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968:982 -> a
-    495:495:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
-    495:495:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
-    496:496:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984:984 -> a
-    497:497:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    497:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):987:987 -> a
-    499:510:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1004:1015 -> a
-    511:521:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1014:1024 -> a
-    522:525:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1065:1068 -> a
-    526:526:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    526:526:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1068 -> a
-    527:527:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1070:1070 -> a
-    528:529:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1146:1147 -> a
-    530:530:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1169:1169 -> a
-    531:532:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> a
-    531:532:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171 -> a
-    533:537:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171:1175 -> a
-    538:538:boolean hasSingleTarget():1318:1318 -> a
-    539:540:void forEachTarget(java.util.function.Consumer):1330:1331 -> a
-    1:1:void setObsolete():165:165 -> a0
-    1:4:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):173:176 -> b
-    5:6:com.android.tools.r8.graph.Code getCode():516:517 -> b
-    5:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176 -> b
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> b
+    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
+    12:13:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:356 -> a
+    14:71:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:422 -> a
+    72:75:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:413 -> a
+    76:79:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):403:406 -> a
+    80:83:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):396:399 -> a
+    84:113:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):389:418 -> a
+    114:133:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):427:446 -> a
+    134:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):443:443 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):440:440 -> a
+    136:136:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):437:437 -> a
+    137:137:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):434:434 -> a
+    138:156:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):431:449 -> a
+    157:158:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):458:459 -> a
+    159:160:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):468:469 -> a
+    161:161:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
+    161:161:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):469 -> a
+    162:162:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):472:472 -> a
+    163:163:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):470:470 -> a
+    164:167:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):477:480 -> a
+    168:168:boolean hasParameterInfo():505:505 -> a
+    168:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480 -> a
+    169:170:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480:481 -> a
+    171:172:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):500:501 -> a
+    171:172:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):481 -> a
+    173:173:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):483:483 -> a
+    174:176:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):487:489 -> a
+    177:178:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:522 -> a
+    179:179:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    179:179:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522 -> a
+    180:181:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):523:524 -> a
+    182:182:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    182:182:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):524 -> a
+    183:183:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):526:526 -> a
+    184:184:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    184:184:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):526 -> a
+    185:185:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):527:527 -> a
+    186:186:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    186:186:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):527 -> a
+    187:187:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):532:532 -> a
+    188:193:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):537:542 -> a
+    194:202:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):592:600 -> a
+    203:208:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:609 -> a
+    209:209:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
+    209:209:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):609 -> a
+    210:211:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):609:610 -> a
+    212:212:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    212:212:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    212:212:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610 -> a
+    213:219:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610:616 -> a
+    220:228:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
+    220:228:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    229:229:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    229:229:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
+    229:229:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    230:231:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
+    230:231:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    232:232:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    232:232:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
+    232:232:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    233:233:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
+    233:233:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    234:234:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    234:234:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
+    234:234:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    235:240:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
+    235:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    241:241:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    241:241:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
+    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    242:245:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
+    242:245:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    246:246:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
+    246:246:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    247:253:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
+    247:253:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    254:254:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    254:254:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
+    254:254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    255:256:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
+    255:256:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    257:257:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
+    257:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    258:261:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
+    258:261:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    262:262:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    262:262:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
+    262:262:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    263:284:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
+    263:284:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    285:288:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617:620 -> a
+    289:289:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    289:289:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    289:289:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610 -> a
+    290:290:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:647 -> a
+    291:291:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    291:291:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):648 -> a
+    292:294:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):649:651 -> a
+    295:295:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    295:295:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):651 -> a
+    296:300:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):652:656 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):711:712 -> a
+    303:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):731:732 -> a
+    303:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    305:305:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):732 -> a
+    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    306:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):733:735 -> a
+    306:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):734:738 -> a
+    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    314:314:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):741 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):741:741 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    316:316:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):740:740 -> a
+    316:316:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    317:317:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    317:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):742 -> a
+    317:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    318:321:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):743:746 -> a
+    318:321:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    322:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):744:759 -> a
+    322:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    338:338:void setObsolete():166:166 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):760 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    339:339:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):761:761 -> a
+    339:339:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    340:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714:714 -> a
+    341:342:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):765:766 -> a
+    341:342:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    343:343:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    343:343:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
+    343:343:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    344:346:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
+    344:346:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    347:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:770 -> a
+    347:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    350:350:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    350:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):771 -> a
+    350:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    351:355:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):772:776 -> a
+    351:355:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    356:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
+    356:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    365:365:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:778 -> a
+    365:365:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    366:366:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    366:366:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):782 -> a
+    366:366:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    367:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):783:786 -> a
+    367:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    371:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784:788 -> a
+    371:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    376:376:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):788 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    377:378:boolean isStaticMember():334:335 -> a
+    377:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):789 -> a
+    377:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    379:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):793:815 -> a
+    379:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    402:402:void setObsolete():166:166 -> a
+    402:402:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):816 -> a
+    402:402:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    403:403:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):817:817 -> a
+    403:403:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    404:408:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):719:723 -> a
+    409:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):722:726 -> a
+    414:414:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    414:414:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726 -> a
+    415:415:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726:726 -> a
+    416:417:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):821:822 -> a
+    418:432:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):826:840 -> a
+    433:433:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:856 -> a
+    434:434:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    434:434:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> a
+    435:451:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:872 -> a
+    452:452:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    452:452:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872 -> a
+    453:455:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:874 -> a
+    456:456:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    456:456:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):874 -> a
+    457:457:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875:875 -> a
+    458:458:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    458:458:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876:876 -> a
+    460:460:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    460:460:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876 -> a
+    461:461:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):877:877 -> a
+    462:467:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):882:887 -> a
+    468:491:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:907 -> a
+    492:492:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):892:892 -> a
+    493:496:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:898 -> a
+    497:497:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    497:497:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    497:497:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    498:498:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    498:498:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    499:501:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):900:902 -> a
+    502:502:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    502:502:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902 -> a
+    503:504:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902:903 -> a
+    505:507:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):911:913 -> a
+    508:511:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):922:925 -> a
+    512:512:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    512:512:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):925 -> a
+    513:513:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):926:926 -> a
+    514:514:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> a
+    514:514:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):926 -> a
+    515:515:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):927:927 -> a
+    516:516:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    516:516:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):927 -> a
+    517:521:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):928:932 -> a
+    522:526:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):929:933 -> a
+    527:532:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968:973 -> a
+    533:533:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    533:533:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    533:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):973 -> a
+    534:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):975:976 -> a
+    536:536:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):976 -> a
+    537:540:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):976:979 -> a
+    541:541:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    541:541:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):979 -> a
+    542:542:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982:982 -> a
+    543:543:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    543:543:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
+    544:548:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:989 -> a
+    549:549:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    549:549:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):989 -> a
+    550:551:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):989:990 -> a
+    552:552:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    552:552:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):990 -> a
+    553:567:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):990:1004 -> a
+    568:568:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    568:568:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004 -> a
+    569:569:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006:1006 -> a
+    570:570:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    570:570:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006 -> a
+    571:571:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1009:1009 -> a
+    572:583:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1026:1037 -> a
+    584:594:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1036:1046 -> a
+    595:598:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1087:1090 -> a
+    599:599:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    599:599:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090 -> a
+    600:600:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1092:1092 -> a
+    601:602:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1168:1169 -> a
+    603:603:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1191 -> a
+    604:605:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> a
+    604:605:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193 -> a
+    606:610:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193:1197 -> a
+    611:611:boolean hasSingleTarget():1340:1340 -> a
+    612:613:void forEachTarget(java.util.function.Consumer):1352:1353 -> a
+    1:1:void setObsolete():166:166 -> a0
+    1:4:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):174:177 -> b
+    5:6:com.android.tools.r8.graph.Code getCode():554:555 -> b
+    5:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177:178 -> b
     9:9:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    9:9:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
-    10:11:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178:179 -> b
-    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):455:458 -> b
-    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> b
-    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458 -> b
-    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458:458 -> b
-    19:22:void upgradeClassFileVersion(int):537:540 -> b
-    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915:915 -> b
+    9:9:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178 -> b
+    10:11:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):179:180 -> b
+    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):493:496 -> b
+    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> b
+    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496 -> b
+    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496:496 -> b
+    19:22:void upgradeClassFileVersion(int):575:578 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:937 -> b
     24:24:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> b
-    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915 -> b
-    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915:922 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937 -> b
+    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:944 -> b
     33:33:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):922 -> b
-    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):922:924 -> b
+    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):944 -> b
+    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):944:946 -> b
     37:37:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):924 -> b
-    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):924:936 -> b
+    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):946 -> b
+    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):946:958 -> b
     51:51:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> b
-    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):936 -> b
-    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:937 -> b
+    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):958 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:959 -> b
     53:53:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> b
-    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):938:938 -> b
+    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960:960 -> b
     55:55:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> b
-    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):938 -> b
-    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939:942 -> b
-    60:60:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):976:976 -> b
+    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960 -> b
+    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:964 -> b
+    60:60:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):998:998 -> b
     61:61:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    61:61:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):976 -> b
-    62:64:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):977:979 -> b
-    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1312:1312 -> b
-    1:1:boolean shouldNotHaveCode():508:508 -> b0
+    61:61:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):998 -> b
+    62:64:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):999:1001 -> b
+    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1334:1334 -> b
+    1:1:boolean shouldNotHaveCode():546:546 -> b0
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b0
-    2:2:boolean shouldNotHaveCode():508 -> b0
-    3:3:boolean shouldNotHaveCode():508:508 -> b0
+    2:2:boolean shouldNotHaveCode():546 -> b0
+    3:3:boolean shouldNotHaveCode():546:546 -> b0
     4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> b0
-    4:4:boolean shouldNotHaveCode():508 -> b0
-    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> c
-    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):833:833 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1306:1306 -> c
-    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():592:595 -> c0
+    4:4:boolean shouldNotHaveCode():546 -> b0
+    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> c
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):871:871 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1328:1328 -> c
+    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:633 -> c0
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> c0
-    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():595 -> c0
-    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():595:597 -> c0
+    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633 -> c0
+    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633:635 -> c0
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():597 -> c0
-    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():597:598 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635 -> c0
+    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635:636 -> c0
     12:12:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():598 -> c0
-    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():599:599 -> c0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> d
-    2:2:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):930:930 -> d
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> c0
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> c0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> d
+    2:2:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):952:952 -> d
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
-    3:3:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):930 -> d
-    4:6:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):931:933 -> d
-    7:7:boolean isValidVirtualTargetForDynamicDispatch():1301:1301 -> d
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():663:669 -> d0
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> e
-    2:3:java.util.List asListOfTargets():1324:1325 -> e
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():639:648 -> e0
-    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> f
-    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():991:992 -> f0
+    3:3:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):952 -> d
+    4:6:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):953:955 -> d
+    7:7:boolean isValidVirtualTargetForDynamicDispatch():1323:1323 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():701:707 -> d0
+    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> e
+    2:3:java.util.List asListOfTargets():1346:1347 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():677:686 -> e0
+    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> f
+    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1013:1014 -> f0
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> f0
-    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():992 -> f0
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():992:996 -> f0
-    9:9:void setObsolete():165:165 -> f0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():997 -> f0
-    1:2:java.lang.String toSourceString():587:588 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1180:1180 -> g
-    1:1:void unsetObsolete():192:192 -> g0
-    1:1:void checkIfObsolete():153:153 -> h0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1055:1055 -> j
-    1:1:boolean isDexEncodedMethod():1049:1049 -> m
-    1:2:boolean isStaticMember():333:334 -> n
-    1:2:com.android.tools.r8.graph.DexReference toReference():1043:1044 -> o
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> p
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> p
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():79 -> p
-    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():652:653 -> q
+    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1014 -> f0
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1014:1018 -> f0
+    9:9:void setObsolete():166:166 -> f0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1019 -> f0
+    1:2:java.lang.String toSourceString():625:626 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1202:1202 -> g
+    1:1:void unsetObsolete():193:193 -> g0
+    1:1:void checkIfObsolete():154:154 -> h0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1077:1077 -> j
+    1:1:boolean isDexEncodedMethod():1071:1071 -> m
+    1:2:boolean isStaticMember():334:335 -> n
+    1:2:com.android.tools.r8.graph.DexReference toReference():1065:1066 -> o
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> p
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> p
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():80 -> p
+    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:691 -> q
     3:3:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> q
-    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():656 -> q
-    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():657:659 -> q
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():628:629 -> r
-    1:2:java.lang.String codeToString():1030:1031 -> s
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1151:1152 -> t
-    1:2:java.lang.String toString():476:477 -> toString
-    1:3:int getClassFileVersion():526:528 -> u
-    1:2:com.android.tools.r8.graph.Code getCode():516:517 -> v
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():169:169 -> w
-    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1157:1165 -> x
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1138:1142 -> y
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> z
+    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():694 -> q
+    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():695:697 -> q
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():666:667 -> r
+    1:2:java.lang.String codeToString():1052:1053 -> s
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1173:1174 -> t
+    1:2:java.lang.String toString():514:515 -> toString
+    1:3:int getClassFileVersion():564:566 -> u
+    1:2:com.android.tools.r8.graph.Code getCode():554:555 -> v
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():170:170 -> w
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1179:1187 -> x
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1160:1164 -> y
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.s0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():391:391 -> <clinit>
-    2:2:void <clinit>():372:372 -> <clinit>
+    1:1:void <clinit>():429:429 -> <clinit>
+    2:2:void <clinit>():384:384 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17958,31 +17970,31 @@
     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>():1183:1183 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1183:1183 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1194:1210 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1206:1206 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1183:1183 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1215:1215 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1224:1243 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1243 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1248 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246 -> a
-    28:28:void setCode(com.android.tools.r8.graph.Code):1273:1273 -> a
-    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1277:1282 -> a
+    1:1:void <clinit>():1205:1205 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1205:1205 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1216:1232 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1228:1228 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1205:1205 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1265 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1265 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268:1270 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268 -> a
+    28:28:void setCode(com.android.tools.r8.graph.Code):1295:1295 -> a
+    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1299:1304 -> a
     35:35:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    35:35:com.android.tools.r8.graph.DexEncodedMethod build():1282 -> a
-    36:42:com.android.tools.r8.graph.DexEncodedMethod build():1281:1287 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253:1253 -> b
+    35:35:com.android.tools.r8.graph.DexEncodedMethod build():1304 -> a
+    36:42:com.android.tools.r8.graph.DexEncodedMethod build():1303:1309 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275:1275 -> b
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1258:1258 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1263:1267 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1280:1280 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1285:1289 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1082:1083 -> <init>
+    1:2:void <init>(boolean):1104:1105 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.v0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -17992,28 +18004,28 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():93:116 -> <clinit>
-    25:25:void <clinit>():89:89 -> <clinit>
-    1:1:void <init>(java.lang.String,int):89:89 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():89:89 -> a
+    1:24:void <clinit>():94:117 -> <clinit>
+    25:25:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.lang.String,int):90:90 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.y0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1087:1087 -> <init>
-    2:2:void <init>():1089:1089 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1109:1109 -> <init>
+    2:2:void <init>():1111:1111 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1121:1122 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1104:1104 -> <clinit>
-    1:1:void <init>():1107:1107 -> <init>
+    1:1:void <clinit>():1126:1126 -> <clinit>
+    1:1:void <init>():1129:1129 -> <init>
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
-    com.android.tools.r8.graph.DexString name -> f
-    com.android.tools.r8.graph.DexType holder -> d
-    com.android.tools.r8.graph.DexType type -> e
+    com.android.tools.r8.graph.DexString name -> g
+    com.android.tools.r8.graph.DexType type -> f
+    com.android.tools.r8.graph.DexType holder -> e
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):17:23 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):10:10 -> a
     2:2:boolean match(com.android.tools.r8.graph.DexItem):10:10 -> a
@@ -18024,17 +18036,17 @@
     9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):63:63 -> a
     10:18:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:109 -> a
-    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113:113 -> a
     22:22:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     22:22:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
     23:23:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117:117 -> a
-    24:24:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    24:24:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     24:24:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117 -> a
     25:25:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     25:25:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
-    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     26:26:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     27:27:boolean match(com.android.tools.r8.graph.DexEncodedField):127:127 -> a
     28:28:boolean match(com.android.tools.r8.graph.DexField):122:122 -> a
@@ -18044,12 +18056,12 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexField):78:78 -> compareTo
     2:2:int compareTo(java.lang.Object):10 -> compareTo
     1:1:java.lang.String toSmaliString():136:136 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     2:2:java.lang.String toSmaliString():136 -> f
     3:3:java.lang.String toSmaliString():136:136 -> f
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     4:4:java.lang.String toSmaliString():136 -> f
     5:5:java.lang.String toSmaliString():136:136 -> f
     1:1:java.lang.String toSourceString():141:141 -> g
@@ -18077,388 +18089,394 @@
     1:1:java.lang.String toSmaliString():60:60 -> f
     1:1:java.lang.String toSourceString():64:64 -> g
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.U0:
-    com.android.tools.r8.graph.DexString newInstanceName -> A0
+    com.android.tools.r8.graph.DexString getMethodName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> b1
-    com.android.tools.r8.graph.DexType mapType -> F2
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
+    com.android.tools.r8.graph.DexType proxyType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> I0
-    com.android.tools.r8.graph.DexString mapDescriptor -> j1
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> R3
-    com.android.tools.r8.graph.DexString getNameName -> r0
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> I0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> j1
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> s3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType boxedByteType -> V1
-    com.android.tools.r8.graph.DexType stringBufferType -> w2
+    com.android.tools.r8.graph.DexType longType -> V1
+    com.android.tools.r8.graph.DexType classType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> z0
-    com.android.tools.r8.graph.DexType charType -> N1
-    com.android.tools.r8.graph.DexType iterableType -> o2
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> Z3
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> z0
+    java.util.Set libraryClassesWithoutStaticInitialization -> g4
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> U3
+    com.android.tools.r8.graph.DexType iteratorType -> O3
+    com.android.tools.r8.graph.DexType charArrayType -> N1
+    com.android.tools.r8.graph.DexType enumType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType callSiteType -> G3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    com.android.tools.r8.graph.DexType stringArrayType -> g2
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> I1
-    java.util.Set libraryMethodsReturningReceiver -> V3
+    com.android.tools.r8.graph.DexType boxedNumberType -> g2
+    com.android.tools.r8.graph.DexString newUpdaterName -> I1
     com.android.tools.r8.graph.DexString toStringMethodName -> i0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> b3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> h3
-    com.android.tools.r8.graph.DexString fieldDescriptor -> Q0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> r1
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> f3
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Q0
+    com.android.tools.r8.graph.DexString callableDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> x3
-    java.util.IdentityHashMap internalSentinels -> e4
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> W2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> x3
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> Y0
-    com.android.tools.r8.graph.DexString npeDescriptor -> z1
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> O2
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> A1
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString icceDescriptor -> z1
+    com.android.tools.r8.graph.DexType supplierType -> O2
+    boolean $assertionsDisabled -> l4
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> t3
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> A1
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexString setDescriptor -> i1
-    com.android.tools.r8.graph.DexType setType -> E2
-    com.android.tools.r8.graph.DexString stringDescriptor -> H0
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Q3
-    com.android.tools.r8.graph.DexString constructorDescriptor -> P0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> q1
-    com.android.tools.r8.graph.DexString forNameMethodName -> q0
-    com.android.tools.r8.graph.DexType boxedBooleanType -> U1
-    com.android.tools.r8.graph.DexType stringBuilderType -> v2
+    com.android.tools.r8.graph.DexString proxyDescriptor -> i1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> E2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> d3
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> H0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> P0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> q1
+    com.android.tools.r8.graph.DexString nameMethodName -> q0
+    com.android.tools.r8.graph.DexType intType -> U1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexString getMethodName -> y0
-    com.android.tools.r8.graph.DexType byteType -> M1
-    com.android.tools.r8.graph.DexType collectionsType -> n2
-    com.android.tools.r8.graph.DexType comparableType -> N3
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> a1
-    com.android.tools.r8.graph.DexType stringType -> f2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> Y2
+    com.android.tools.r8.graph.DexString getFieldName -> y0
+    java.util.Set libraryTypesAssumedToBePresent -> f4
+    com.android.tools.r8.graph.DexType classArrayType -> n2
+    com.android.tools.r8.graph.DexType lookupType -> N3
+    com.android.tools.r8.graph.DexString mathDescriptor -> a1
+    com.android.tools.r8.graph.DexType boxedShortType -> f2
+    com.android.tools.r8.graph.DexString unknownTypeName -> j4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
     com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    com.android.tools.r8.graph.DexString thisName -> H1
-    com.android.tools.r8.graph.DexType metafactoryType -> F3
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> p0
-    com.android.tools.r8.graph.DexType annotationSignature -> w3
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> F3
+    com.android.tools.r8.graph.DexString ordinalMethodName -> p0
+    com.android.tools.r8.graph.DexType icceType -> V2
+    com.android.tools.r8.graph.DexType annotationDefault -> w3
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    com.android.tools.r8.graph.DexString mathDescriptor -> X0
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> y1
-    com.android.tools.r8.graph.DexType throwableType -> N2
-    com.android.tools.r8.graph.DexString invokeMethodName -> C0
-    java.util.Set libraryClassesWithoutStaticInitialization -> a4
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> d1
-    boolean $assertionsDisabled -> f4
+    com.android.tools.r8.graph.DexString objectsDescriptor -> X0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> y1
+    com.android.tools.r8.graph.DexType callableType -> N2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> a4
+    com.android.tools.r8.graph.DexString newInstanceName -> C0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> d1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> p3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType listType -> D2
+    com.android.tools.r8.graph.DexType methodTypeType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> m3
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> K0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> l1
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> T3
+    com.android.tools.r8.graph.DexString stringDescriptor -> K0
+    com.android.tools.r8.graph.DexString listDescriptor -> l1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> k3
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getSimpleNameName -> t0
+    com.android.tools.r8.graph.DexString getNameName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> X2
-    com.android.tools.r8.graph.DexType voidType -> T1
-    com.android.tools.r8.graph.DexType autoCloseableType -> u2
-    com.android.tools.r8.graph.DexType externalizableType -> M3
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> i3
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> q3
+    com.android.tools.r8.graph.DexType floatType -> T1
+    com.android.tools.r8.graph.DexType strictMathType -> u2
+    com.android.tools.r8.graph.DexType callSiteType -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType booleanType -> L1
-    com.android.tools.r8.graph.DexType objectsType -> m2
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> C1
+    com.android.tools.r8.graph.DexType objectArrayType -> m2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> n3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> C1
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> e2
+    com.android.tools.r8.graph.DexType boxedLongType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> E3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> K1
+    com.android.tools.r8.graph.DexType annotationThrows -> E3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
     com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexString enumDescriptor -> S0
-    com.android.tools.r8.graph.DexString throwableDescriptor -> t1
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> u3
+    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> U2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> v3
-    com.android.tools.r8.graph.DexType optionalType -> M2
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> U2
+    com.android.tools.r8.graph.DexType comparatorType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> c1
-    com.android.tools.r8.graph.DexString assertionsDisabled -> B0
-    com.android.tools.r8.graph.DexType serviceLoaderType -> C2
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> k1
-    com.android.tools.r8.graph.DexString objectDescriptor -> J0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> c1
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> B0
+    java.util.Map libraryMethodsWithoutSideEffects -> d4
+    com.android.tools.r8.graph.DexType methodHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> s0
-    com.android.tools.r8.graph.DexType shortType -> S1
-    com.android.tools.r8.graph.DexType classLoaderType -> t2
+    com.android.tools.r8.graph.DexString forNameMethodName -> s0
+    com.android.tools.r8.graph.DexType doubleType -> S1
+    com.android.tools.r8.graph.DexType mathType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> a3
-    com.android.tools.r8.graph.DexType annotationType -> l2
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> h3
+    com.android.tools.r8.graph.DexType comparableType -> T3
+    com.android.tools.r8.graph.DexType objectType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType serializableType -> L3
+    com.android.tools.r8.graph.DexType metafactoryType -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> B1
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> f3
-    com.android.tools.r8.graph.DexType charSequenceType -> d2
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> D3
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> i3
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> B1
+    com.android.tools.r8.graph.DexType boxedIntType -> d2
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> D3
     com.android.tools.r8.graph.DexString internMethodName -> j0
+    com.android.tools.r8.graph.DexString constructorMethodName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    java.util.Set libraryMethodsReturningNonNull -> W3
-    com.android.tools.r8.graph.DexString methodDescriptor -> R0
-    com.android.tools.r8.graph.DexString arraysDescriptor -> s1
-    com.android.tools.r8.graph.DexType npeType -> T2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> u3
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> R0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> s1
+    com.android.tools.r8.graph.DexType throwableType -> T2
     java.util.concurrent.ConcurrentHashMap types -> b
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Z0
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> P3
-    com.android.tools.r8.graph.DexType runnableType -> L2
-    com.android.tools.r8.graph.DexString unknownTypeName -> d4
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> e3
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> E0
-    com.android.tools.r8.graph.DexString proxyDescriptor -> f1
-    com.android.tools.r8.graph.DexType proxyType -> B2
+    com.android.tools.r8.graph.DexString iterableDescriptor -> Z0
+    com.android.tools.r8.graph.DexType mapEntryType -> L2
+    boolean skipNameValidationForTesting -> h4
+    com.android.tools.r8.graph.DexString invokeMethodName -> E0
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType varHandleType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> o3
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> M0
-    com.android.tools.r8.graph.DexString callableDescriptor -> n1
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> k3
-    com.android.tools.r8.graph.DexType boxedIntType -> Z1
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> c3
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> v0
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> S3
-    com.android.tools.r8.graph.DexType longType -> R1
-    com.android.tools.r8.graph.DexType classType -> s2
+    com.android.tools.r8.graph.DexString objectDescriptor -> M0
+    com.android.tools.r8.graph.DexString mapDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedByteType -> Z1
+    com.android.tools.r8.graph.DexString getSimpleNameName -> v0
+    com.android.tools.r8.graph.DexType externalizableType -> S3
+    com.android.tools.r8.graph.DexType charType -> R1
+    com.android.tools.r8.graph.DexType iterableType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType charArrayType -> J1
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> Z2
-    com.android.tools.r8.graph.DexType enumerationType -> K3
-    com.android.tools.r8.graph.DexType enumType -> k2
-    com.android.tools.r8.graph.DexString newUpdaterName -> E1
-    java.util.Set libraryTypesAssumedToBePresent -> Z3
+    java.util.Set libraryMethodsReturningNonNull -> c4
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> K3
+    com.android.tools.r8.graph.DexType stringArrayType -> k2
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> C3
-    com.android.tools.r8.graph.DexType boxedNumberType -> c2
+    com.android.tools.r8.graph.DexType annotationSignature -> C3
+    com.android.tools.r8.graph.DexType boxedFloatType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> l3
-    com.android.tools.r8.graph.DexString finalizeMethodName -> m0
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> p3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> V2
-    com.android.tools.r8.graph.DexString objectsDescriptor -> U0
-    com.android.tools.r8.graph.DexString icceDescriptor -> v1
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> S2
-    com.android.tools.r8.graph.DexType annotationInnerClass -> t3
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> M1
+    com.android.tools.r8.graph.DexString initMethodName -> m0
+    com.android.tools.r8.graph.DexString methodDescriptor -> U0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> v1
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> S2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> e3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType consumerType -> K2
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> e1
-    com.android.tools.r8.graph.DexType callableType -> I2
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> D0
+    com.android.tools.r8.graph.DexType mapType -> K2
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> e1
+    com.android.tools.r8.graph.DexType listType -> I2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexString classDescriptor -> L0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> m1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> A2
-    com.android.tools.r8.graph.DexType boxedFloatType -> Y1
-    com.android.tools.r8.graph.DexType methodTypeType -> z2
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> g3
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> U3
-    com.android.tools.r8.graph.DexString getTypeNameName -> u0
-    com.android.tools.r8.graph.DexType intType -> Q1
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> r2
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> L0
+    com.android.tools.r8.graph.DexString setDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBufferType -> A2
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Y1
+    com.android.tools.r8.graph.DexType stringBuilderType -> z2
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> u0
+    com.android.tools.r8.graph.DexType byteType -> Q1
+    com.android.tools.r8.graph.DexType collectionsType -> r2
+    com.android.tools.r8.graph.DexType serializableType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexType classArrayType -> j2
+    java.util.Set libraryMethodsReturningReceiver -> b4
+    com.android.tools.r8.graph.DexType stringType -> j2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> g3
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> V3
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> D1
-    com.android.tools.r8.graph.DexType listIteratorType -> J3
+    com.android.tools.r8.graph.DexString npeDescriptor -> D1
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> J3
     java.util.Map setFiles -> n
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Y3
-    com.android.tools.r8.graph.DexType boxedShortType -> b2
-    com.android.tools.r8.graph.DexType nullValueType -> c4
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> d3
-    com.android.tools.r8.graph.DexString getClassMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> B3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> b2
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> l3
+    com.android.tools.r8.graph.DexString wrapperFieldName -> l0
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> B3
+    com.android.tools.r8.graph.DexString thisName -> L1
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> o3
+    com.android.tools.r8.graph.DexType npeType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexString annotationDescriptor -> T0
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> u1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> W2
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> R2
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> s3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> T0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> u1
+    com.android.tools.r8.graph.DexType optionalType -> R2
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType supplierType -> J2
-    com.android.tools.r8.graph.DexType comparatorType -> H2
+    com.android.tools.r8.graph.DexType setType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> G0
-    com.android.tools.r8.graph.DexString listDescriptor -> h1
-    boolean skipNameValidationForTesting -> b4
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> p1
-    com.android.tools.r8.graph.DexType boxedDoubleType -> X1
-    com.android.tools.r8.graph.DexType methodHandleType -> y2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> G0
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> h1
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> a3
+    com.android.tools.r8.graph.DexString classDescriptor -> O0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> p1
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Y3
+    com.android.tools.r8.graph.DexType voidType -> X1
+    com.android.tools.r8.graph.DexType autoCloseableType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> x0
-    com.android.tools.r8.graph.DexType floatType -> P1
-    com.android.tools.r8.graph.DexType strictMathType -> q2
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> O3
-    com.android.tools.r8.graph.DexType objectArrayType -> i2
-    com.android.tools.r8.graph.DexType iteratorType -> I3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> G1
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> X3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> x0
+    com.android.tools.r8.graph.DexType enumerationType -> Q3
+    com.android.tools.r8.graph.DexType booleanType -> P1
+    com.android.tools.r8.graph.DexType objectsType -> q2
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> e4
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> i2
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> I3
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType boxedLongType -> a2
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> A3
-    java.util.Map libraryMethodsWithoutSideEffects -> X3
-    com.android.tools.r8.graph.DexString nameMethodName -> o0
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> n3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> z3
+    com.android.tools.r8.graph.DexType boxedCharType -> a2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> A3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> O1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> r3
+    com.android.tools.r8.graph.DexString finalizeMethodName -> o0
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Y2
+    com.android.tools.r8.graph.DexType annotationInnerClass -> z3
+    java.util.IdentityHashMap internalSentinels -> k4
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString iterableDescriptor -> W0
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> x1
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Q2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> r3
-    com.android.tools.r8.graph.DexType mapEntryType -> G2
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> g1
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> F0
+    com.android.tools.r8.graph.DexString annotationDescriptor -> W0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> x1
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> v3
+    com.android.tools.r8.graph.DexType runnableType -> Q2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> G2
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> g1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> m3
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> N0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> o1
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType boxedCharType -> W1
-    com.android.tools.r8.graph.DexType varHandleType -> x2
+    com.android.tools.r8.graph.DexType shortType -> W1
+    com.android.tools.r8.graph.DexType classLoaderType -> x2
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> W3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString getFieldName -> w0
-    com.android.tools.r8.graph.DexType doubleType -> O1
-    com.android.tools.r8.graph.DexType mathType -> p2
-    com.android.tools.r8.graph.DexType objectType -> h2
-    com.android.tools.r8.graph.DexType lookupType -> H3
+    com.android.tools.r8.graph.DexString getTypeNameName -> w0
+    com.android.tools.r8.graph.DexType annotationType -> p2
+    com.android.tools.r8.graph.DexType listIteratorType -> P3
+    com.android.tools.r8.graph.DexType charSequenceType -> h2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> H3
+    com.android.tools.r8.graph.DexType nullValueType -> i4
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b3
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> j3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString constructorMethodName -> F1
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexString ordinalMethodName -> n0
-    com.android.tools.r8.graph.DexType annotationThrows -> y3
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> V0
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> w1
+    com.android.tools.r8.graph.DexString getClassMethodName -> n0
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> y3
+    com.android.tools.r8.graph.DexString enumDescriptor -> V0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType icceType -> P2
-    com.android.tools.r8.graph.DexType annotationDefault -> q3
-    com.android.tools.r8.kotlin.Kotlin kotlin -> j3
+    com.android.tools.r8.graph.DexType consumerType -> P2
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:355:void <init>():65:418 -> <init>
-    356:404:void <init>():408:456 -> <init>
-    405:421:void <init>():446:462 -> <init>
-    422:440:void <init>():459:477 -> <init>
-    441:461:void <init>():468:488 -> <init>
-    462:494:void <init>():481:513 -> <init>
-    495:499:void <init>():512:516 -> <init>
-    500:503:void <init>():515:518 -> <init>
-    504:541:void <init>():509:546 -> <init>
-    542:544:void <init>():106:108 -> <init>
-    545:545:void <init>():107:107 -> <init>
+    2:363:void <init>():65:426 -> <init>
+    364:412:void <init>():416:464 -> <init>
+    413:429:void <init>():454:470 -> <init>
+    430:448:void <init>():467:485 -> <init>
+    449:469:void <init>():476:496 -> <init>
+    470:502:void <init>():489:521 -> <init>
+    503:507:void <init>():520:524 -> <init>
+    508:511:void <init>():523:526 -> <init>
+    512:549:void <init>():517:554 -> <init>
+    550:552:void <init>():106:108 -> <init>
+    553:553:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):421:422 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):434:436 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):523:523 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):523:523 -> a
-    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1138:1139 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):429:430 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):442:444 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):531:531 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):531:531 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1153:1154 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139 -> a
-    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139:1140 -> a
-    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1145:1146 -> a
-    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1150:1151 -> a
-    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1187:1187 -> a
-    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1213:1214 -> a
-    22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214 -> a
-    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214:1214 -> a
-    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1205:1205 -> a
-    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214 -> a
-    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1218:1220 -> a
-    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
-    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1228:1230 -> a
-    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1234:1237 -> a
-    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1303:1308 -> a
-    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1238 -> a
-    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1235:1235 -> a
-    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1242:1242 -> a
-    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252:1252 -> a
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154:1155 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1160:1161 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1165:1166 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1202:1202 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1228:1229 -> a
+    22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229:1229 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1220:1220 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229 -> a
+    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1233:1235 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1243:1245 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1249:1252 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1318:1323 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1250:1250 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1257:1257 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267:1267 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252 -> a
-    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252:1253 -> a
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267:1268 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1255 -> a
-    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1254:1256 -> a
-    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1269:1273 -> a
-    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1290:1297 -> a
-    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1269:1271 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1284:1288 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1305:1312 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1299 -> a
-    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
-    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1299:1299 -> a
-    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
-    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1274:1280 -> a
-    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1279:1283 -> a
-    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1312:1314 -> a
-    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1325:1327 -> a
-    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1336:1337 -> a
-    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1345:1354 -> a
-    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1358:1360 -> a
-    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1396:1398 -> a
-    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1403:1405 -> a
-    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1413:1413 -> a
-    117:119:void clearTypeLatticeElementsCache():1417:1419 -> a
-    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1446:1453 -> a
-    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1452:1480 -> a
-    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1460:1468 -> a
-    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1467:1478 -> a
-    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1485:1486 -> a
-    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1489:1490 -> a
-    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1497:1501 -> a
-    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1498:1498 -> a
-    188:194:void sort(com.android.tools.r8.naming.NamingLens):1506:1512 -> a
-    195:195:void forAllTypes(java.util.function.Consumer):1529:1529 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1191:1197 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1196:1198 -> b
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1314 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1314:1314 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1289:1295 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1294:1298 -> a
+    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1327:1329 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1340:1342 -> a
+    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1351:1352 -> a
+    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1360:1369 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1373:1375 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1411:1413 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1418:1420 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1428:1428 -> a
+    117:119:void clearTypeLatticeElementsCache():1432:1434 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1461:1468 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1467:1495 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1475:1483 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1482:1493 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1500:1501 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1504:1505 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1512:1516 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1513:1513 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1521:1527 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1544:1544 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1206:1212 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1211:1213 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198:1199 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1205:1205 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1364:1366 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1388:1388 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1409:1409 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):557:557 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1155:1155 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1209:1209 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1370:1372 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1392:1392 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1186:1187 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1186:1186 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1376:1378 -> d
-    1:5:java.util.Collection extractMarker():1161:1165 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1382:1384 -> e
-    1:5:java.util.List extractMarkers():1175:1179 -> f
-    1:1:boolean getSkipNameValidationForTesting():553:553 -> g
-    1:10:void resetSortedIndices():1516:1525 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1423:1425 -> i
-    1:12:java.util.Set boxedValueOfMethods():431:442 -> j
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213:1214 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1220:1220 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1379:1381 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1403:1403 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1424:1424 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1170:1170 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1224:1224 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1385:1387 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1407:1407 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1201:1202 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1201:1201 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1391:1393 -> d
+    1:5:java.util.Collection extractMarker():1176:1180 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1397:1399 -> e
+    1:5:java.util.List extractMarkers():1190:1194 -> f
+    1:1:boolean getSkipNameValidationForTesting():561:561 -> g
+    1:10:void resetSortedIndices():1531:1540 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1438:1440 -> i
+    1:12:java.util.Set boxedValueOfMethods():439:450 -> j
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):600:600 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):604:609 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):615:615 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):619:624 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):814:814 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):820:839 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):843:843 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):829:829 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):835:854 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):858:858 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
@@ -18474,47 +18492,47 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getMembers -> m
     java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):643:643 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):660:689 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):643:643 -> a
-    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):693:693 -> a
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):697:697 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):658:658 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):675:704 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):658:658 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):708:708 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):712:712 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):701:701 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):705:707 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):716:716 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):720:722 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):715:715 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):722:742 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):737:757 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):570:570 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):574:578 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):578:578 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):582:586 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):584:584 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):560:560 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):564:566 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):565:565 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):568:568 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):572:574 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):573:573 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):750:750 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):754:756 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):765:765 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):769:771 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):614:614 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):621:628 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):629:629 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):636:643 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):633:633 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):637:639 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):638:638 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):648:648 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):652:654 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):653:653 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -18523,9 +18541,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):1026:1061 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1069:1079 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1086:1091 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1041:1076 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1084:1094 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1101:1106 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
@@ -18536,24 +18554,24 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):770:770 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):782:802 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):806:806 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):785:785 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):797:817 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):821:821 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1095:1095 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1099:1104 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1101:1101 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1110:1110 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1114:1119 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1116:1116 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1108:1108 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1115:1121 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1127 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1129 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1133:1133 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1123:1123 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1130:1136 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1134:1142 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1144 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1148:1148 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -18576,19 +18594,19 @@
     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>():918:918 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):918:918 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):942:986 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):991:991 -> a
-    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):995:999 -> a
+    1:1:void <clinit>():933:933 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):933:933 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):957:1001 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1006:1006 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1010:1014 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):999 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1002:1018 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1014 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017:1033 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1018 -> a
-    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1021:1021 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> b
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1033 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036:1036 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -18608,16 +18626,18 @@
     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):847:847 -> <init>
-    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):870:913 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):862:862 -> <init>
+    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):885:928 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
-    com.android.tools.r8.graph.DexMethod initCause -> c
-    com.android.tools.r8.graph.DexMethod getSuppressed -> b
+    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):584:584 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):590:592 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):591:594 -> <init>
-    9:11:void <init>(com.android.tools.r8.graph.DexItemFactory):593:595 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):592:592 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):599:601 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):600:603 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):602:609 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):607:607 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -18638,7 +18658,7 @@
     1:1:java.lang.String toSourceString():92:92 -> g
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
     1:1:java.lang.String toString():87:87 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():87 -> toString
 com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Z0:
     com.android.tools.r8.graph.Descriptor item -> a
@@ -18655,11 +18675,11 @@
 com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.C.Y0:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
 com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.C.a1:
-    com.android.tools.r8.graph.DexProto proto -> e
-    com.android.tools.r8.graph.DexString name -> f
-    com.android.tools.r8.graph.DexType holder -> d
-    boolean $assertionsDisabled -> h
-    java.util.Map singleTargetCache -> g
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.graph.DexProto proto -> f
+    com.android.tools.r8.graph.DexString name -> g
+    com.android.tools.r8.graph.DexType holder -> e
+    java.util.Map singleTargetCache -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):22:28 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):12:12 -> a
@@ -18675,7 +18695,7 @@
     9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
     10:18:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
-    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
     22:22:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
@@ -18685,7 +18705,7 @@
     24:24:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
     25:25:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     25:25:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     26:26:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     27:27:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
     28:28:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
@@ -18701,8 +18721,8 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
     1:1:java.lang.String toSmaliString():166:166 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     2:2:java.lang.String toSmaliString():166 -> f
     3:3:java.lang.String toSmaliString():166:166 -> f
     4:4:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> f
@@ -18723,11 +18743,11 @@
     1:1:java.lang.String qualifiedName():161:161 -> s
     1:1:java.lang.String toString():35:35 -> toString
 com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.c1:
-    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> d
-    com.android.tools.r8.graph.Descriptor fieldOrMethod -> e
-    com.android.tools.r8.graph.DexMethod rewrittenTarget -> g
-    boolean isInterface -> f
-    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.graph.Descriptor fieldOrMethod -> f
+    com.android.tools.r8.graph.DexMethod rewrittenTarget -> h
+    boolean isInterface -> g
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):208:212 -> <init>
     6:10:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean,com.android.tools.r8.graph.DexMethod):219:223 -> <init>
@@ -18772,7 +18792,7 @@
     36:36:boolean isMethodHandle():297:297 -> a
     36:36:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
     37:44:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
-    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     45:45:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
     46:53:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
     54:54:boolean isFieldHandle():293:293 -> a
@@ -18897,7 +18917,7 @@
     boolean isNotProgramClass() -> X
     boolean isProgramClass() -> Y
     1:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:131 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131 -> a
     8:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:133 -> a
     11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
@@ -18925,57 +18945,51 @@
     27:27:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):444:444 -> b
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> c
     4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):276:278 -> c
-    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> c
+    7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339 -> c
-    9:9:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> c
+    8:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
+    9:9:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     10:10:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    10:10:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340 -> c
-    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340:340 -> c
+    10:10:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
+    11:11:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     12:12:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    12:12:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> c
-    13:13:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> c
-    13:13:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    14:14:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    14:14:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349 -> c
-    14:14:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    15:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:350 -> c
-    15:16:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    17:17:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350 -> c
-    17:17:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    18:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350:351 -> c
-    18:19:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    20:20:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    20:20:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> c
-    20:20:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    21:23:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> c
-    21:23:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    24:24:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    24:24:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    25:25:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    25:25:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
-    25:25:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    26:26:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    26:26:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    27:27:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    27:27:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
-    27:27:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    28:28:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    28:28:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    29:29:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    29:29:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
-    29:29:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    30:33:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
-    30:33:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    34:35:void setInitialClassFileVersion(int):388:389 -> c
-    1:3:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
-    4:6:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
-    7:7:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> d
+    12:12:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
+    13:16:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
+    17:18:void setInitialClassFileVersion(int):388:389 -> c
+    1:1:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> d
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
+    2:2:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339 -> d
+    3:3:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> d
+    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> d
+    4:4:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340 -> d
+    5:5:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340:340 -> d
+    6:6:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    6:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> d
+    7:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> d
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
+    8:8:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349 -> d
+    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    9:10:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:350 -> d
+    9:10:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    11:11:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> d
+    11:11:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350 -> d
+    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    12:13:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350:351 -> d
+    12:13:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    14:14:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    14:14:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> d
+    14:14:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    15:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> d
+    15:17:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    18:18:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> d
+    19:21:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
+    22:24:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
     1:12:void computeStaticValues():291:302 -> d0
     13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> d0
     13:13:void computeStaticValues():302 -> d0
     14:16:void computeStaticValues():308:310 -> d0
+    1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
     1:2:int getInitialClassFileVersion():397:398 -> e0
     1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> f0
     1:1:java.lang.String toSourceString():214:214 -> g
@@ -18993,7 +19007,7 @@
     1:1:boolean originatesFromDexResource():116:116 -> o0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
     1:1:java.lang.String toString():209:209 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():209 -> toString
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.d1:
     java.util.Iterator iterator -> b
@@ -19006,21 +19020,21 @@
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
 com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.f1:
-    com.android.tools.r8.graph.DexProto SENTINEL -> g
-    com.android.tools.r8.graph.DexTypeList parameters -> f
-    com.android.tools.r8.graph.DexString shorty -> d
-    com.android.tools.r8.graph.DexType returnType -> e
+    com.android.tools.r8.graph.DexProto SENTINEL -> h
+    com.android.tools.r8.graph.DexString shorty -> e
+    com.android.tools.r8.graph.DexTypeList parameters -> g
+    com.android.tools.r8.graph.DexType returnType -> f
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):17:20 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9:9 -> a
     2:2:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:86 -> a
     2:2:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     3:3:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     3:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     4:4:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):88:88 -> a
     4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     5:5:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     5:5:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     6:6:int slowCompareTo(java.lang.Object):9:9 -> a
@@ -19060,10 +19074,10 @@
     boolean isDexMethod() -> p
     boolean isDexType() -> q
 com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.i1:
-    com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> f
-    boolean $assertionsDisabled -> g
-    int size -> d
-    byte[] content -> e
+    com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
+    boolean $assertionsDisabled -> h
+    int size -> e
+    byte[] content -> f
     1:3:void <clinit>():17:19 -> <clinit>
     1:3:void <init>(int,byte[]):25:27 -> <init>
     4:6:void <init>(java.lang.String):30:32 -> <init>
@@ -19121,86 +19135,86 @@
     25:25:char nextChar():43:43 -> a
     1:1:boolean hasNext():70:70 -> hasNext
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.C.j1:
-    com.android.tools.r8.graph.DexString descriptor -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> f
-    java.lang.String toStringCache -> e
-    1:2:void <clinit>():27:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):33:33 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):31:35 -> <init>
-    1:10:boolean isD8R8SynthesizedClassType():252:261 -> A
-    1:1:boolean isDoubleType():221:221 -> B
-    1:1:boolean isLongType():217:217 -> C
-    1:4:boolean isPrimitiveArrayType():241:244 -> D
-    1:1:boolean isPrimitiveType():180:180 -> E
-    1:2:boolean isReferenceType():235:236 -> F
-    1:1:boolean isVoidType():189:189 -> G
-    1:1:java.lang.String toDescriptorString():86:86 -> H
-    1:1:char toShorty():111:111 -> I
+    java.lang.String toStringCache -> f
+    com.android.tools.r8.graph.DexString descriptor -> e
+    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> g
+    boolean $assertionsDisabled -> h
+    1:2:void <clinit>():30:31 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):36:36 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexString):34:38 -> <init>
+    1:13:boolean isD8R8SynthesizedClassType():255:267 -> A
+    1:1:boolean isDoubleType():224:224 -> B
+    1:1:boolean isLongType():220:220 -> C
+    1:4:boolean isPrimitiveArrayType():244:247 -> D
+    1:1:boolean isPrimitiveType():183:183 -> E
+    1:2:boolean isReferenceType():238:239 -> F
+    1:1:boolean isVoidType():192:192 -> G
+    1:1:java.lang.String toDescriptorString():89:89 -> H
+    1:1:char toShorty():114:114 -> I
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27:27 -> a
-    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):174:175 -> a
-    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30:30 -> a
+    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):177:178 -> a
+    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
     4:4:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
-    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):176 -> a
-    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
-    5:5:int slowCompareTo(java.lang.Object):27:27 -> a
-    6:7:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):57:58 -> a
-    8:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):72:76 -> a
-    13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):128:129 -> a
+    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):179 -> a
+    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
+    5:5:int slowCompareTo(java.lang.Object):30:30 -> a
+    6:7:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):60:61 -> a
+    8:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):75:79 -> a
+    13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:132 -> a
     15:15:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):129 -> a
-    16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):142:142 -> a
-    17:26:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):313:322 -> a
-    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):326:328 -> a
-    30:32:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):327:329 -> a
-    33:33:java.lang.String getPackageOrName(boolean):333:333 -> a
-    34:34:java.lang.String toDescriptorString():86:86 -> a
-    34:34:java.lang.String getPackageOrName(boolean):334 -> a
-    35:40:java.lang.String getPackageOrName(boolean):335:340 -> a
-    41:41:java.lang.String getPackageDescriptor():345:345 -> a
-    41:41:boolean isSamePackage(com.android.tools.r8.graph.DexType):82 -> a
-    42:42:java.lang.String getPackageDescriptor():345:345 -> a
-    42:42:boolean isSamePackage(com.android.tools.r8.graph.DexType):82 -> a
-    43:43:boolean isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    1:2:boolean computeEquals(java.lang.Object):45:46 -> b
-    3:3:int slowCompareTo(com.android.tools.r8.graph.DexType):162:162 -> b
-    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):303:308 -> b
-    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):307:309 -> b
-    1:1:int compareTo(java.lang.Object):27:27 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexType):157:157 -> compareTo
-    2:2:int compareTo(java.lang.Object):27 -> compareTo
-    1:1:java.lang.String toDescriptorString():86:86 -> f
-    1:1:java.lang.String toSmaliString():117 -> f
-    1:4:java.lang.String toSourceString():99:102 -> g
-    5:5:java.lang.String toDescriptorString():86:86 -> g
-    5:5:java.lang.String toSourceString():104 -> g
+    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):132 -> a
+    16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
+    17:26:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):319:328 -> a
+    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):332:334 -> a
+    30:32:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):333:335 -> a
+    33:33:java.lang.String getPackageOrName(boolean):339:339 -> a
+    34:34:java.lang.String toDescriptorString():89:89 -> a
+    34:34:java.lang.String getPackageOrName(boolean):340 -> a
+    35:40:java.lang.String getPackageOrName(boolean):341:346 -> a
+    41:41:java.lang.String getPackageDescriptor():351:351 -> a
+    41:41:boolean isSamePackage(com.android.tools.r8.graph.DexType):85 -> a
+    42:42:java.lang.String getPackageDescriptor():351:351 -> a
+    42:42:boolean isSamePackage(com.android.tools.r8.graph.DexType):85 -> a
+    43:43:boolean isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    1:2:boolean computeEquals(java.lang.Object):48:49 -> b
+    3:3:int slowCompareTo(com.android.tools.r8.graph.DexType):165:165 -> b
+    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):309:314 -> b
+    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):313:315 -> b
+    1:1:int compareTo(java.lang.Object):30:30 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexType):160:160 -> compareTo
+    2:2:int compareTo(java.lang.Object):30 -> compareTo
+    1:1:java.lang.String toDescriptorString():89:89 -> f
+    1:1:java.lang.String toSmaliString():120 -> f
+    1:4:java.lang.String toSourceString():102:105 -> g
+    5:5:java.lang.String toDescriptorString():89:89 -> g
+    5:5:java.lang.String toSourceString():107 -> g
     6:6:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> g
-    6:6:java.lang.String toSourceString():104 -> g
-    7:10:java.lang.String toSourceString():104:107 -> g
-    1:1:int computeHashCode():40:40 -> h
+    6:6:java.lang.String toSourceString():107 -> g
+    7:10:java.lang.String toSourceString():107:110 -> g
+    1:1:int computeHashCode():43:43 -> h
     com.android.tools.r8.graph.DexType asDexType() -> n
     boolean isDexType() -> q
-    1:16:int elementSizeForPrimitiveArrayType():275:290 -> r
-    1:1:java.lang.String getInternalName():357:357 -> s
-    2:2:java.lang.String toDescriptorString():86:86 -> s
-    2:2:java.lang.String getInternalName():358 -> s
-    3:3:java.lang.String getInternalName():358:358 -> s
-    1:4:java.lang.String getName():349:352 -> t
-    1:1:java.lang.String toString():122:122 -> toString
-    1:1:int getNumberOfLeadingSquareBrackets():296:296 -> u
-    1:1:java.lang.String getPackageDescriptor():345:345 -> v
-    1:1:java.lang.String toDescriptorString():86:86 -> w
-    1:1:java.lang.String toBinaryName():90 -> w
-    1:1:java.lang.String getPackageName():362 -> w
-    2:4:java.lang.String toBinaryName():91:93 -> w
-    2:4:java.lang.String getPackageName():362 -> w
-    5:8:java.lang.String toBinaryName():91:94 -> w
-    5:8:java.lang.String getPackageName():362 -> w
-    9:9:java.lang.String getPackageName():362:362 -> w
-    1:1:boolean isArrayType():225:225 -> x
-    1:1:boolean isBooleanType():193:193 -> y
-    1:1:boolean isClassType():230:230 -> z
+    1:16:int elementSizeForPrimitiveArrayType():281:296 -> r
+    1:1:java.lang.String getInternalName():363:363 -> s
+    2:2:java.lang.String toDescriptorString():89:89 -> s
+    2:2:java.lang.String getInternalName():364 -> s
+    3:3:java.lang.String getInternalName():364:364 -> s
+    1:4:java.lang.String getName():355:358 -> t
+    1:1:java.lang.String toString():125:125 -> toString
+    1:1:int getNumberOfLeadingSquareBrackets():302:302 -> u
+    1:1:java.lang.String getPackageDescriptor():351:351 -> v
+    1:1:java.lang.String toDescriptorString():89:89 -> w
+    1:1:java.lang.String toBinaryName():93 -> w
+    1:1:java.lang.String getPackageName():368 -> w
+    2:4:java.lang.String toBinaryName():94:96 -> w
+    2:4:java.lang.String getPackageName():368 -> w
+    5:8:java.lang.String toBinaryName():94:97 -> w
+    5:8:java.lang.String getPackageName():368 -> w
+    9:9:java.lang.String getPackageName():368:368 -> w
+    1:1:boolean isArrayType():228:228 -> x
+    1:1:boolean isBooleanType():196:196 -> y
+    1:1:boolean isClassType():233:233 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.k1:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
@@ -19211,7 +19225,7 @@
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):39:40 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):46:46 -> a
     4:10:int compareTo(com.android.tools.r8.graph.DexTypeList):80:86 -> a
-    11:11:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    11:11:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     11:11:int compareTo(com.android.tools.r8.graph.DexTypeList):86 -> a
     12:12:int compareTo(com.android.tools.r8.graph.DexTypeList):92:92 -> a
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
@@ -19521,9 +19535,9 @@
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1026 -> a
     2:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1059:1062 -> a
-    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> a
+    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> a
     6:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
-    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:985 -> a
+    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:983 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
     1:1:boolean equals(java.lang.Object):1049:1049 -> equals
     java.lang.Object asAsmEncodedObject() -> h
@@ -19679,7 +19693,7 @@
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
     1:2:java.lang.String toString():78:79 -> toString
-    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     3:3:java.lang.String toString():79 -> toString
     4:6:java.lang.String toString():79:81 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.N1:
@@ -19947,8 +19961,8 @@
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
 com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.c2:
-    int sortedIndex -> b
-    boolean $assertionsDisabled -> c
+    int sortedIndex -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>():12:15 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -19991,10 +20005,10 @@
     1:1:boolean isAnonymous():46:46 -> e
     1:1:boolean isNamed():42:42 -> f
     1:1:java.lang.String toString():108:108 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     2:2:java.lang.String toString():109 -> toString
     3:4:java.lang.String toString():109:110 -> toString
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     5:5:java.lang.String toString():110 -> toString
     6:7:java.lang.String toString():110:111 -> toString
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.e2:
@@ -20358,7 +20372,7 @@
     5:5:void visitEnd():798 -> c
     6:8:boolean classRequiresCode():788:790 -> c
     6:8:void visitEnd():798 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
     9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
@@ -20406,11 +20420,11 @@
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> p
 com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.r2:
-    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> d
-    com.android.tools.r8.graph.CfCode code -> c
-    com.android.tools.r8.graph.JarApplicationReader application -> b
-    boolean reachabilitySensitive -> e
-    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    com.android.tools.r8.graph.CfCode code -> d
+    boolean reachabilitySensitive -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():83:83 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):92:103 -> <init>
     13:15:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):94:96 -> <init>
@@ -20495,7 +20509,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20531,16 +20545,16 @@
     277:277:void visitInsn(int):544:544 -> a
     278:278:void visitInsn(int):541:541 -> a
     279:279:void visitTypeInsn(int,java.lang.String):665:665 -> a
-    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
@@ -20553,7 +20567,7 @@
     335:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
     336:336:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
     337:343:void visitLdcInsn(java.lang.Object):777:783 -> a
-    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     344:344:void visitLdcInsn(java.lang.Object):783 -> a
     345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
     363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
@@ -20564,13 +20578,13 @@
     371:376:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
     377:381:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
     382:383:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
     385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
     424:424:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):879:879 -> a
     425:428:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):878:881 -> a
     429:432:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):887:890 -> a
-    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     433:433:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):891 -> a
     434:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):892:892 -> a
     435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):888:894 -> a
@@ -20769,7 +20783,7 @@
     9:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createMap(java.util.Collection,java.util.function.Consumer):79:86 -> a
     17:28:com.android.tools.r8.graph.DexProgramClass[] sortClasses(com.android.tools.r8.graph.DexApplication,java.util.Collection):140:151 -> a
     29:31:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):146:148 -> a
-    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     32:32:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):148 -> a
     33:33:java.util.Collection keysOrEmpty(java.util.Map):155:155 -> a
     34:34:java.util.Collection getCallSites():183:183 -> a
@@ -21399,7 +21413,7 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):24:26 -> <init>
     1:9:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):30:38 -> a
-    10:10:boolean com.android.tools.r8.graph.DexType.isIntType():209:209 -> a
+    10:10:boolean com.android.tools.r8.graph.DexType.isIntType():212:212 -> a
     10:10:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):38 -> a
     11:20:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):42:51 -> a
     21:28:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):59:66 -> a
@@ -21559,7 +21573,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     18:18:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21586,7 +21600,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21812,7 +21826,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):961:961 -> 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):959:959 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -21969,7 +21983,7 @@
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
@@ -21978,7 +21992,7 @@
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
@@ -22005,15 +22019,15 @@
     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):975:975 -> 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):973:973 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):975 -> 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):973 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):975 -> 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):959:959 -> 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):973 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):976:976 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):974:974 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -22040,50 +22054,42 @@
     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
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70 -> a
-    3:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():71:72 -> a
-    4:5:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():72 -> a
-    6:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    7:11:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):42:46 -> a
-    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    12:12:int getNesting():53 -> a
-    12:12:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    13:15:int getNesting():54:56 -> a
-    13:15:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    16:16:int getNesting():56 -> a
-    16:16:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    17:17:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48:48 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
-    19:19:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    19:19:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
-    20:31: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
-    32:33:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
-    34:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):85:89 -> a
-    39:39:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
-    40:44:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
-    40:44:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
-    45:55: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
-    56: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):173:185 -> a
-    69:71: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
-    69:71: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
-    72:72:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    72:72: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 -> a
-    72:72: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
-    73:73: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):352:352 -> a
-    73:73: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
-    74:74: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:344 -> a
+    3:9:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40:46 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
+    10:10:int getNesting():53 -> a
+    10:10:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    11:13:int getNesting():54:56 -> a
+    11:13:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
+    14:14:int getNesting():56 -> a
+    14:14:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    15:15:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48:48 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
+    18:29: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
+    30:31:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
+    32:36:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):85:89 -> a
+    37:37:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
+    38:42:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
+    38:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
+    43:53: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
+    54: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):173:185 -> a
+    67:69: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
+    67:69: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
+    70:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    70:70: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 -> a
+    70:70: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
+    71:71: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):352:352 -> a
+    71:71: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
+    72:72: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:344 -> a
+    72:72: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
+    73:73:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    73:73: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 -> a
+    73:73: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
+    74:74: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):345:345 -> a
     74:74: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
-    75:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    75:75: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 -> a
-    75:75: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
-    76:76: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):345:345 -> a
-    76:76: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:4:boolean equals(java.lang.Object):117:120 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
@@ -22199,14 +22205,26 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):221:223 -> <init>
 com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.s.i:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):30:31 -> <init>
-    1:22:void recomputeTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):39:60 -> a
-    23:33:boolean verifyAllPhiOperandsAreBottom(java.util.Set):66:76 -> a
-    34:34:boolean verifyAllPhiOperandsAreBottom(java.util.Set):72:72 -> a
-    1:8:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):85:92 -> b
+    boolean $assertionsDisabled -> c
+    java.util.function.Function mapping -> b
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):31:33 -> <init>
+    1:11:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):40:50 -> a
+    12:18:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):94:100 -> a
+    12:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
+    20:30:boolean verifyAllPhiOperandsAreBottom(java.util.Set):76:86 -> a
+    20:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    31:31:boolean verifyAllPhiOperandsAreBottom(java.util.Set):82:82 -> a
+    31:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    32:44:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:67 -> a
+    45:45:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    45:45:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67 -> a
+    46:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67:71 -> a
+    51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71 -> a
+    52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71:71 -> a
 com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.s.j:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
@@ -22310,7 +22328,7 @@
     1:1:int hashCode():42:42 -> hashCode
     boolean isNullType() -> p
     1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
 com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.s.s:
@@ -22342,36 +22360,37 @@
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> b
     boolean mayHaveImpreciseTypes -> a
     1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):48:48 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):38:50 -> <init>
-    1:2:void analyze():54:55 -> a
-    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):131:136 -> a
-    3:8:void analyze():55 -> a
-    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):60:63 -> a
-    13:15:void narrowing(java.lang.Iterable):73:75 -> a
-    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):79:82 -> a
-    20:22:void enqueue(com.android.tools.r8.ir.code.Value):86:88 -> a
-    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):94:109 -> a
-    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):49:49 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):39:51 -> <init>
+    1:2:void analyze():55:56 -> a
+    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):137:142 -> a
+    3:8:void analyze():56 -> a
+    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):61:64 -> a
+    13:15:void narrowing(java.lang.Iterable):74:76 -> a
+    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):85:88 -> a
+    20:22:void enqueue(com.android.tools.r8.ir.code.Value):92:94 -> a
+    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):100:115 -> a
+    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    39:39:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):106 -> a
-    39:39:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    40:41:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):112:113 -> a
-    40:41:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
+    39:39:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):112 -> a
+    39:39:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    40:41:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):118:119 -> a
+    40:41:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
     42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    42:42:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):113 -> a
-    42:42:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    43:53:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):116:126 -> a
-    43:53:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    54:81:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:167 -> a
-    82:113:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):173:204 -> a
-    1:1:void widening(java.lang.Iterable):67:67 -> b
-    2:2:boolean lambda$getRefinedReceiverType$1(com.android.tools.r8.ir.code.Value):179:179 -> b
+    42:42:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):119 -> a
+    42:42:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    43:53:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):122:132 -> a
+    43:53:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    54:83:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):146:175 -> a
+    84:96:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):181:193 -> a
+    1:1:boolean verifyValuesUpToDate(java.lang.Iterable):80:80 -> b
+    1:1:void widening(java.lang.Iterable):68:68 -> c
 com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.s.v:
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
-    1:4:void <clinit>():30:33 -> <clinit>
+    1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
 com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.s.x:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
@@ -22481,8 +22500,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22501,7 +22520,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22511,9 +22530,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():56:56 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22525,9 +22544,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> u2
-    1:1:int maxOutValueRegister():59:59 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():54:54 -> v2
+    1:1:int maxOutValueRegister():59:59 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22542,14 +22561,14 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
-    int opcode() -> w2
+    1:2:int maxInValueRegister():54:55 -> v2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> F2
-    boolean isAnd() -> P0
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -22562,14 +22581,14 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,boolean):27:29 -> <init>
     boolean hasInvariantOutType() -> I0
-    boolean isArgument() -> Q0
+    boolean isArgument() -> R0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -22583,15 +22602,15 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():52:52 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> F2
-    boolean isArithmeticBinop() -> R0
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
     26:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
@@ -22616,12 +22635,13 @@
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():33:33 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():264:264 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayGet() -> S0
+    boolean isArrayGet() -> T0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():53:53 -> a
@@ -22687,17 +22707,17 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayLength() -> T0
+    boolean isArrayLength() -> U0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
@@ -22720,23 +22740,23 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> B2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayPut() -> U0
+    boolean isArrayPut() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():71:71 -> a
@@ -22778,24 +22798,23 @@
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():125:125 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():125:125 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Assume$Assumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):30:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> A2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> B2
-    boolean isIntroducingAnAlias() -> C1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> B2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    boolean isIntroducingAnAlias() -> D1
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isAssume() -> V0
-    1:1:boolean isAssumeDynamicType():132:132 -> W0
-    1:1:boolean isAssumeNonNull():145:145 -> X0
+    boolean isAssume() -> W0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Assume createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):55:55 -> a
@@ -22833,7 +22852,7 @@
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
     3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66 -> c
     4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
-    boolean isOutConstant() -> d2
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
     2:2:boolean isAssumeDynamicType():132:132 -> j
@@ -22858,10 +22877,10 @@
     10:10:java.lang.String toString():300 -> toString
     11:17:java.lang.String toString():300:306 -> toString
     18:18:java.lang.String toString():297:297 -> toString
-    1:1:int maxInValueRegister():209:209 -> u2
-    1:1:int maxOutValueRegister():214:214 -> v2
+    1:1:int maxInValueRegister():209:209 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():214:214 -> w2
+    int opcode() -> x2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -22930,369 +22949,382 @@
     java.util.List phis -> h
     java.util.Map incompletePhis -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:124:void <init>():53:176 -> <init>
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():221:222 -> A
-    1:2:boolean hasCatchHandlers():535:536 -> B
-    1:1:boolean hasIncompletePhis():1061:1061 -> C
-    1:1:boolean hasOneNormalExit():1447:1447 -> D
-    1:1:boolean hasPhis():519:519 -> E
-    1:1:boolean hasUniquePredecessor():217:217 -> F
-    1:2:void incrementUnfilledPredecessorCount():625:626 -> G
-    1:1:boolean isEmpty():570:570 -> H
-    1:1:boolean isFilled():527:527 -> I
-    1:1:boolean isSealed():1049:1049 -> J
-    1:11:boolean isSimpleAlwaysThrowingPath():1424:1434 -> K
-    1:1:boolean isTrivialGoto():1379:1379 -> L
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1523:1523 -> M
-    1:1:int numberOfCatchHandlers():1472:1472 -> N
-    1:1:java.util.LinkedList getInstructions():562:562 -> O
-    1:1:int numberOfThrowingInstructions():1477 -> O
-    2:3:int numberOfThrowingInstructions():1477:1478 -> O
-    1:2:void removeAllNormalSuccessors():282:283 -> P
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:124:void <init>():54:177 -> <init>
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():222:223 -> A
+    1:2:boolean hasCatchHandlers():536:537 -> B
+    1:1:boolean hasIncompletePhis():1096:1096 -> C
+    1:1:boolean hasOneNormalExit():1482:1482 -> D
+    1:1:boolean hasPhis():520:520 -> E
+    1:1:boolean hasUniquePredecessor():218:218 -> F
+    1:2:void incrementUnfilledPredecessorCount():660:661 -> G
+    1:1:boolean isEmpty():605:605 -> H
+    1:1:boolean isFilled():528:528 -> I
+    1:1:boolean isSealed():1084:1084 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1459:1469 -> K
+    1:1:boolean isTrivialGoto():1414:1414 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1558:1558 -> M
+    1:1:int numberOfCatchHandlers():1507:1507 -> N
+    1:1:java.util.LinkedList getInstructions():563:563 -> O
+    1:1:int numberOfThrowingInstructions():1512 -> O
+    2:3:int numberOfThrowingInstructions():1512:1513 -> O
+    1:2:void removeAllNormalSuccessors():283:284 -> P
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> P
-    3:3:void removeAllNormalSuccessors():283 -> P
-    4:12:void removeAllNormalSuccessors():284:292 -> P
-    1:9:java.lang.String toDetailedString():1102:1110 -> Q
-    10:10:boolean isFilled():527:527 -> Q
-    10:10:java.lang.String toDetailedString():1110 -> Q
-    11:12:java.lang.String toDetailedString():1110:1111 -> Q
-    13:13:boolean isSealed():1049:1049 -> Q
-    13:13:java.lang.String toDetailedString():1111 -> Q
-    14:51:java.lang.String toDetailedString():1111:1148 -> Q
-    52:52:int digits(int):1098:1098 -> Q
-    52:52:java.lang.String toDetailedString():1148 -> Q
-    53:88:java.lang.String toDetailedString():1148:1183 -> Q
-    1:3:void unlinkCatchHandler():739:741 -> R
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():700:704 -> S
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():710:714 -> T
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():723:728 -> U
-    1:2:boolean verifyFilledPredecessors():640:641 -> V
-    1:2:boolean notifyPredecessorsMayChangeListeners():235:236 -> W
-    1:2:boolean notifySuccessorsMayChangeListeners():196:197 -> X
-    1:1:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):84:84 -> a
-    2:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> a
-    3:3:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):89:89 -> a
-    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):179:183 -> a
-    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):258:266 -> a
-    18:18:java.util.List getPhis():523:523 -> a
-    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):267 -> a
-    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):267:275 -> a
+    3:3:void removeAllNormalSuccessors():284 -> P
+    4:12:void removeAllNormalSuccessors():285:293 -> P
+    1:9:java.lang.String toDetailedString():1137:1145 -> Q
+    10:10:boolean isFilled():528:528 -> Q
+    10:10:java.lang.String toDetailedString():1145 -> Q
+    11:12:java.lang.String toDetailedString():1145:1146 -> Q
+    13:13:boolean isSealed():1084:1084 -> Q
+    13:13:java.lang.String toDetailedString():1146 -> Q
+    14:51:java.lang.String toDetailedString():1146:1183 -> Q
+    52:52:int digits(int):1133:1133 -> Q
+    52:52:java.lang.String toDetailedString():1183 -> Q
+    53:88:java.lang.String toDetailedString():1183:1218 -> Q
+    1:3:void unlinkCatchHandler():774:776 -> R
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():735:739 -> S
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():745:749 -> T
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():758:763 -> U
+    1:2:boolean verifyFilledPredecessors():675:676 -> V
+    1:2:boolean notifyPredecessorsMayChangeListeners():236:237 -> W
+    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> X
+    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
+    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):180:184 -> a
+    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):259:267 -> a
+    18:18:java.util.List getPhis():524:524 -> a
+    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):268 -> a
+    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):268:276 -> a
     28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
-    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):276 -> a
-    29:46:void swapSuccessorsByIndex(int,int):305:322 -> a
-    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):437:444 -> a
-    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):448:451 -> a
+    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):277 -> a
+    29:46:void swapSuccessorsByIndex(int,int):306:323 -> a
+    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):438:445 -> a
+    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):449:452 -> a
     59:60:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):33:34 -> a
-    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451 -> a
-    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451:456 -> a
+    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452 -> a
+    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452:457 -> a
     67:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456 -> a
-    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:474 -> a
+    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457 -> a
+    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457:475 -> a
     87:87:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476 -> a
-    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476:492 -> a
-    105:105:java.util.LinkedList getInstructions():562:562 -> a
-    105:105:boolean consistentBlockInstructions(boolean,boolean):64 -> a
-    106:112:boolean consistentBlockInstructions(boolean,boolean):64:70 -> a
-    113:113:java.util.List getPredecessors():226:226 -> a
-    113:113:boolean consistentBlockInstructions(boolean,boolean):71 -> a
-    114:116:boolean consistentBlockInstructions(boolean,boolean):71:73 -> a
-    117:121:boolean consistentBlockInstructions(boolean,boolean):72:76 -> a
-    122:122:java.util.LinkedList getInstructions():562:562 -> a
-    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97 -> a
-    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:98 -> a
+    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477 -> a
+    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477:493 -> a
+    105:105:java.util.LinkedList getInstructions():563:563 -> a
+    105:105:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    106:112:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    113:113:java.util.List getPredecessors():227:227 -> a
+    113:113:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    114:116:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    117:121:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    122:122:java.util.LinkedList getInstructions():563:563 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
     125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
-    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):566:566 -> a
-    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):601:602 -> a
-    130:132:void clearMark(int):614:616 -> a
-    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):646:646 -> a
-    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:660 -> a
-    135:135:boolean isFilled():527:527 -> a
-    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660 -> a
-    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:663 -> a
-    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:667 -> a
-    141:141:boolean isFilled():527:527 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):667 -> a
-    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:671 -> a
+    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):567:567 -> a
+    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):636:637 -> a
+    130:132:void clearMark(int):649:651 -> a
+    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):681:681 -> a
+    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:695 -> a
+    135:135:boolean isFilled():528:528 -> a
+    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695 -> a
+    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:698 -> a
+    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:702 -> a
+    141:141:boolean isFilled():528:528 -> a
+    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):702 -> a
+    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:706 -> a
     147:147:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
-    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):671 -> a
-    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):672:672 -> a
-    149:150:boolean verifyNoValuesAfterThrowingInstruction():1509:1510 -> a
-    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> a
-    151:151:boolean verifyNoValuesAfterThrowingInstruction():1510 -> a
-    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    152:157:boolean verifyNoValuesAfterThrowingInstruction():1511:1516 -> a
-    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
+    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):706 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):707:707 -> a
+    149:150:boolean verifyNoValuesAfterThrowingInstruction():1544:1545 -> a
+    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> a
+    151:151:boolean verifyNoValuesAfterThrowingInstruction():1545 -> a
+    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    152:157:boolean verifyNoValuesAfterThrowingInstruction():1546:1551 -> a
+    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
     158:158:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    158:158:boolean verifyNoValuesAfterThrowingInstruction():1516 -> a
-    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    159:159:boolean verifyNoValuesAfterThrowingInstruction():1516:1516 -> a
-    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):673:673 -> a
-    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1008:1019 -> a
-    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):674 -> a
-    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):754:754 -> a
-    174:178:boolean isCatchHandlerForSingleGuard():780:784 -> a
-    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):755 -> a
-    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):757:761 -> a
-    184:184:boolean lambda$removeCatchHandlerWithGuard$5(int,com.android.tools.r8.ir.code.BasicBlock):772:772 -> a
-    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):801:810 -> a
-    195:204:void linkCatchSuccessors(java.util.List,java.util.List):849:858 -> a
-    205:208:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):862:865 -> a
-    209:219:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):875:885 -> a
-    220:221:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> a
-    220:221:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):948 -> a
-    222:224:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):950:952 -> a
-    225:243:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):973:991 -> a
-    244:248:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):998:1002 -> a
-    249:252:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1001:1004 -> a
-    253:254:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1024:1025 -> a
-    255:259:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1053:1057 -> a
-    260:267:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1070:1077 -> a
-    268:271:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1187:1190 -> a
-    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1195:1227 -> a
-    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1231:1232 -> a
-    307:319:void removeInstructions(java.util.List):1253:1265 -> a
-    320:320:void setInstructions(java.util.LinkedList):1245:1245 -> a
-    320:320:void removeInstructions(java.util.List):1266 -> a
-    321:322: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):1290:1291 -> a
-    323:327:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1304:1308 -> a
-    328:334: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[]):1339:1345 -> a
-    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1361:1361 -> a
+    158:158:boolean verifyNoValuesAfterThrowingInstruction():1551 -> a
+    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    159:159:boolean verifyNoValuesAfterThrowingInstruction():1551:1551 -> a
+    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):708:708 -> a
+    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1043:1054 -> a
+    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):789:789 -> a
+    174:178:boolean isCatchHandlerForSingleGuard():815:819 -> a
+    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):790 -> a
+    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):792:796 -> a
+    184:184:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):807:807 -> a
+    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):836:845 -> a
+    195:204:void linkCatchSuccessors(java.util.List,java.util.List):884:893 -> a
+    205:208:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):897:900 -> a
+    209:219:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):910:920 -> a
+    220:221:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> a
+    220:221:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):983 -> a
+    222:224:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):985:987 -> a
+    225:243:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1008:1026 -> a
+    244:248:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1033:1037 -> a
+    249:252:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1036:1039 -> a
+    253:254:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1059:1060 -> a
+    255:259:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1088:1092 -> a
+    260:267:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1105:1112 -> a
+    268:271:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1222:1225 -> a
+    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1230:1262 -> a
+    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1266:1267 -> a
+    307:319:void removeInstructions(java.util.List):1288:1300 -> a
+    320:320:void setInstructions(java.util.LinkedList):1280:1280 -> a
+    320:320:void removeInstructions(java.util.List):1301 -> a
+    321:322: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):1325:1326 -> a
+    323:327:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1339:1343 -> a
+    328:334: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[]):1374:1380 -> a
+    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1396:1396 -> a
     336:336:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    336:336:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1361 -> a
-    337:345:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1362:1370 -> a
-    346:346:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    346:346:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1371 -> a
-    347:347:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    347:347:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1372 -> a
-    348:349: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):1373:1374 -> a
-    350:351:boolean canThrow():1486:1487 -> a
-    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535:1535 -> a
-    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    355:355:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1543:1543 -> a
-    356:356:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1554:1554 -> a
-    357:362:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1572:1577 -> a
-    363:363:java.util.List getSuccessors():187:187 -> a
-    363:363:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1578 -> a
-    364:369:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1578:1583 -> a
-    370:375:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1604:1609 -> a
-    370:375:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1587 -> a
-    376:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1591:1595 -> a
-    381:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1620:1636 -> a
-    398:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1664 -> a
-    398:407: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):1636 -> a
+    336:336:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1396 -> a
+    337:345:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1397:1405 -> a
+    346:346:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    346:346:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1406 -> a
+    347:347:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    347:347:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1407 -> a
+    348:349: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):1408:1409 -> a
+    350:351:boolean canThrow():1521:1522 -> a
+    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    355:355:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1578:1578 -> a
+    356:356:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1589:1589 -> a
+    357:362:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1607:1612 -> a
+    363:363:java.util.List getSuccessors():188:188 -> a
+    363:363:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1613 -> a
+    364:369:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1613:1618 -> a
+    370:375:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1639:1644 -> a
+    370:375:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1622 -> a
+    376:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1626:1630 -> a
+    381:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1655:1671 -> a
+    398:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1699 -> a
+    398:407: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):1671 -> a
     408:408:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    408:408:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1665 -> a
-    408:408: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):1636 -> a
-    409:411:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1665:1667 -> a
-    409:411: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):1636 -> a
-    412:412:java.util.LinkedList getInstructions():562:562 -> a
-    412:412:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1668 -> a
-    412:412: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):1636 -> a
-    413:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1668:1685 -> a
-    413:430:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1686 -> a
-    431:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    432:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1687:1690 -> a
-    432:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    436:436:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1691 -> a
-    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    437:442:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1692:1697 -> a
-    437:442:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    443:443:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1675 -> a
-    443:443: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):1636 -> a
+    408:408:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1700 -> a
+    408:408: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):1671 -> a
+    409:411:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1700:1702 -> a
+    409:411: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):1671 -> a
+    412:412:java.util.LinkedList getInstructions():563:563 -> a
+    412:412:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1703 -> a
+    412:412: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):1671 -> a
+    413:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1703:1720 -> a
+    413:430:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1721 -> a
+    431:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    432:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1722:1725 -> a
+    432:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    436:436:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726 -> a
+    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    437:442:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1727:1732 -> a
+    437:442:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    443:443:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1710 -> a
+    443:443: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):1671 -> a
     444:444:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    444:444:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675 -> a
-    444:444: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):1636 -> a
-    445:479:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1709 -> a
-    445:479:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
+    444:444:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710 -> a
+    444:444: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):1671 -> a
+    445:479:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1744 -> a
+    445:479:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
     480:480:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
-    480:480:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1711 -> a
-    480:480:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
+    480:480:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    480:480:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
     481:481:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    481:481:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1712 -> a
-    481:481: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):1636 -> a
-    482:482:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1712:1712 -> a
-    482:482: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):1636 -> a
-    483:483:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1655 -> a
-    483:483: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):1636 -> a
-    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):236:236 -> b
-    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):327:355 -> b
-    31:31:java.util.LinkedList getInstructions():562:562 -> b
-    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):357 -> b
-    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):357:357 -> b
+    481:481:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1747 -> a
+    481:481: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):1671 -> a
+    482:482:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1747:1747 -> a
+    482:482: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):1671 -> a
+    483:483:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1690 -> a
+    483:483: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):1671 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):237:237 -> b
+    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):328:356 -> b
+    31:31:java.util.LinkedList getInstructions():563:563 -> b
+    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):358 -> b
+    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):358:358 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359:359 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:360 -> b
     35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
-    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:363 -> b
-    40:40:java.util.List getPredecessors():226:226 -> b
-    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):424 -> b
-    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):424:424 -> b
-    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    42:42:java.util.List getPredecessors():226:226 -> b
-    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427 -> b
-    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427:428 -> b
-    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363:368 -> b
-    51:51:java.util.LinkedList getInstructions():562:562 -> b
-    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369 -> b
-    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369:378 -> b
-    62:62:java.util.LinkedList getInstructions():562:562 -> b
-    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):379 -> b
-    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):379:415 -> b
-    100:101:void removePhisByIndex(java.util.List):513:514 -> b
-    102:103:void decrementUnfilledPredecessorCount(int):630:631 -> b
-    104:105:void removePhi(com.android.tools.r8.ir.code.Phi):650:651 -> b
-    106:115:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):766:775 -> b
-    116:117:java.util.Set cleanForRemoval():815:816 -> b
-    118:118:java.util.List getPhis():523:523 -> b
-    118:118:java.util.Set cleanForRemoval():817 -> b
-    119:126:java.util.Set cleanForRemoval():817:824 -> b
-    127:127:java.util.List getPhis():523:523 -> b
-    127:127:java.util.Set cleanForRemoval():825 -> b
-    128:131:java.util.Set cleanForRemoval():825:828 -> b
-    132:132:java.util.List getPhis():523:523 -> b
-    132:132:java.util.Set cleanForRemoval():831 -> b
-    133:133:java.util.Set cleanForRemoval():831:831 -> b
-    134:134:java.util.LinkedList getInstructions():562:562 -> b
-    134:134:java.util.Set cleanForRemoval():832 -> b
-    135:135:java.util.Set cleanForRemoval():832:832 -> b
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    136:136:java.util.Set cleanForRemoval():833 -> b
-    137:137:java.util.Set cleanForRemoval():834:834 -> b
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    138:138:java.util.Set cleanForRemoval():835 -> b
-    139:146:java.util.Set cleanForRemoval():835:842 -> b
-    147:148:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> b
-    147:148:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):942 -> b
-    149:152:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1029:1032 -> b
-    153:153:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> b
-    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):197:197 -> c
-    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:301 -> c
-    7:8:boolean isMarked(int):620:621 -> c
-    9:9:boolean blocksClean(java.util.List):686:686 -> c
-    10:12:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1274:1276 -> c
-    13:13:void clearCatchHandlers():1463:1463 -> c
-    14:23:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1814:1823 -> c
-    24:24:java.util.List getSuccessors():187:187 -> c
-    24:24:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1824 -> c
-    25:27:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1824:1826 -> c
-    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):679:682 -> d
-    5:5:void clearCurrentDefinitions():921:921 -> d
-    6:6:java.util.List getPhis():523:523 -> d
-    6:6:void clearCurrentDefinitions():922 -> d
-    7:8:void clearCurrentDefinitions():922:923 -> d
-    9:9:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> d
-    10:10:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> d
-    10:10:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):566 -> d
-    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):252:254 -> e
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361:364 -> b
+    40:40:java.util.List getPredecessors():227:227 -> b
+    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):425 -> b
+    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):425:425 -> b
+    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    42:42:java.util.List getPredecessors():227:227 -> b
+    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):428 -> b
+    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):428:429 -> b
+    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364:369 -> b
+    51:51:java.util.LinkedList getInstructions():563:563 -> b
+    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):370 -> b
+    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):370:379 -> b
+    62:62:java.util.LinkedList getInstructions():563:563 -> b
+    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):380 -> b
+    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):380:416 -> b
+    100:101:void removePhisByIndex(java.util.List):514:515 -> b
+    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):571:571 -> b
+    103:104:void decrementUnfilledPredecessorCount(int):665:666 -> b
+    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):685:686 -> b
+    107:116:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):801:810 -> b
+    117:118:java.util.Set cleanForRemoval():850:851 -> b
+    119:119:java.util.List getPhis():524:524 -> b
+    119:119:java.util.Set cleanForRemoval():852 -> b
+    120:127:java.util.Set cleanForRemoval():852:859 -> b
+    128:128:java.util.List getPhis():524:524 -> b
+    128:128:java.util.Set cleanForRemoval():860 -> b
+    129:132:java.util.Set cleanForRemoval():860:863 -> b
+    133:133:java.util.List getPhis():524:524 -> b
+    133:133:java.util.Set cleanForRemoval():866 -> b
+    134:134:java.util.Set cleanForRemoval():866:866 -> b
+    135:135:java.util.LinkedList getInstructions():563:563 -> b
+    135:135:java.util.Set cleanForRemoval():867 -> b
+    136:136:java.util.Set cleanForRemoval():867:867 -> b
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    137:137:java.util.Set cleanForRemoval():868 -> b
+    138:138:java.util.Set cleanForRemoval():869:869 -> b
+    139:139:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    139:139:java.util.Set cleanForRemoval():870 -> b
+    140:147:java.util.Set cleanForRemoval():870:877 -> b
+    148:149:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> b
+    148:149:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):977 -> b
+    150:153:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1064:1067 -> 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):298:302 -> c
+    7:8:boolean isMarked(int):655:656 -> c
+    9:9:boolean blocksClean(java.util.List):721:721 -> c
+    10:10:void clearCatchHandlers():1498:1498 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> c
+    12:21:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1849:1858 -> c
+    22:22:java.util.List getSuccessors():188:188 -> c
+    22:22:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1859 -> c
+    23:25:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1859:1861 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):714:717 -> d
+    5:5:void clearCurrentDefinitions():956:956 -> d
+    6:6:java.util.List getPhis():524:524 -> d
+    6:6:void clearCurrentDefinitions():957 -> d
+    7:8:void clearCurrentDefinitions():957:958 -> d
+    9:11:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1309:1311 -> d
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):253:255 -> e
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> e
-    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254 -> e
-    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254:254 -> e
-    6:7:void clearUserInfo():596:597 -> e
-    8:11:void mark(int):607:610 -> e
-    1:2:int numberInstructions(int):554:555 -> f
-    3:4:boolean consistentCatchHandlers():892:893 -> f
-    5:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> f
-    5:5:boolean consistentCatchHandlers():894 -> f
-    6:7:boolean consistentCatchHandlers():896:897 -> f
-    8:14:boolean consistentCatchHandlers():896:902 -> f
-    15:15:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    15:15:boolean consistentCatchHandlers():902 -> f
-    16:25:boolean consistentCatchHandlers():902:911 -> f
-    26:26:java.util.List getSuccessors():187:187 -> f
-    26:26:boolean consistentCatchHandlers():912 -> f
-    27:30:boolean consistentCatchHandlers():912:915 -> f
-    31:32:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1467:1468 -> f
-    1:2:void setNumber(int):545:546 -> g
-    3:4:void decrementUnfilledPredecessorCount():635:636 -> g
-    5:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1729:1765 -> g
-    42:42:java.util.List getPredecessors():226:226 -> g
-    42:42:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1765 -> g
-    43:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1765:1766 -> g
-    45:45:java.util.List getPhis():523:523 -> g
-    45:45:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1766 -> g
-    46:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1766:1785 -> g
-    66:66:java.util.List getPredecessors():226:226 -> g
-    66:66:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1785 -> g
-    67:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1785:1789 -> g
-    72:72:java.util.List getPredecessors():226:226 -> g
-    72:72:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1789 -> g
-    73:88:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1789:1804 -> g
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255:255 -> e
+    6:7:void clearUserInfo():631:632 -> e
+    8:11:void mark(int):642:645 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):567 -> e
+    1:2:int numberInstructions(int):555:556 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):572:572 -> f
+    4:5:boolean consistentCatchHandlers():927:928 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> f
+    6:6:boolean consistentCatchHandlers():929 -> f
+    7:8:boolean consistentCatchHandlers():931:932 -> f
+    9:15:boolean consistentCatchHandlers():931:937 -> f
+    16:16:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    16:16:boolean consistentCatchHandlers():937 -> f
+    17:26:boolean consistentCatchHandlers():937:946 -> f
+    27:27:java.util.List getSuccessors():188:188 -> f
+    27:27:boolean consistentCatchHandlers():947 -> f
+    28:31:boolean consistentCatchHandlers():947:950 -> f
+    32:33:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1502:1503 -> f
+    1:2:void setNumber(int):546:547 -> g
+    3:4:void decrementUnfilledPredecessorCount():670:671 -> g
+    5:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1764:1800 -> g
+    42:42:java.util.List getPredecessors():227:227 -> g
+    42:42:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800 -> g
+    43:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1801 -> g
+    45:45:java.util.List getPhis():524:524 -> g
+    45:45:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1801 -> g
+    46:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1801:1820 -> g
+    66:66:java.util.List getPredecessors():227:227 -> g
+    66:66:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1820 -> g
+    67:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1820:1824 -> g
+    72:72:java.util.List getPredecessors():227:227 -> g
+    72:72:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1824 -> g
+    73:88:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1824:1839 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$4(com.android.tools.r8.ir.code.BasicBlock):688:689 -> h
-    3:17:void deduplicatePhis():1857:1871 -> h
-    java.lang.String lambda$toDetailedString$6(com.android.tools.r8.ir.code.BasicBlock) -> i
-    1:4:void detachAllSuccessors():793:796 -> i
-    5:6:boolean verifyOnThrowWrite(int):1499:1500 -> i
-    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1091:1092 -> j
-    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1036:1044 -> j
-    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092 -> j
-    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092:1092 -> j
-    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1407:1409 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():574:574 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():584:585 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():585 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():586:588 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():578:580 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1451:1455 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> o
-    1:1:java.util.LinkedList getInstructions():562:562 -> p
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():93:93 -> q
-    1:2:java.util.List getMutablePredecessors():230:231 -> r
-    1:2:java.util.List getMutableSuccessors():191:192 -> s
-    1:7:java.util.List getNormalPredecessors():242:248 -> t
-    1:1:java.lang.String toString():1083:1083 -> toString
-    1:11:java.util.List getNormalSuccessors():203:213 -> u
-    1:2:int getNumber():540:541 -> v
-    1:1:java.lang.String getNumberAsString():550:550 -> w
-    1:1:java.util.List getPhis():523:523 -> x
-    1:1:java.util.List getPredecessors():226:226 -> y
-    1:1:java.util.List getSuccessors():187:187 -> z
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
+    3:17:void deduplicatePhis():1892:1906 -> h
+    java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock) -> i
+    1:4:void detachAllSuccessors():828:831 -> i
+    5:6:boolean verifyOnThrowWrite(int):1534:1535 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1126:1127 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1071:1079 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127:1127 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1442:1444 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():609:609 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():619:620 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():620 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():621:623 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():613:615 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1486:1490 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> o
+    1:1:java.util.LinkedList getInstructions():563:563 -> p
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
+    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutableSuccessors():192:193 -> s
+    1:7:java.util.List getNormalPredecessors():243:249 -> t
+    1:1:java.lang.String toString():1118:1118 -> toString
+    1:11:java.util.List getNormalSuccessors():204:214 -> u
+    1:2:int getNumber():541:542 -> v
+    1:1:java.lang.String getNumberAsString():551:551 -> w
+    1:1:java.util.List getPhis():524:524 -> x
+    1:1:java.util.List getPredecessors():227:227 -> y
+    1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.D.b.q:
+    com.android.tools.r8.ir.code.Instruction next -> b
+    com.android.tools.r8.ir.code.Instruction val$instruction -> c
+    com.android.tools.r8.ir.code.BasicBlock this$0 -> d
+    com.android.tools.r8.ir.code.InstructionIterator iterator -> a
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):572:575 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():578:580 -> f
+    1:1:boolean hasNext():589:589 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():594:598 -> next
+    1:5:java.lang.Object next():572 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():596:596 -> next
+    6:6:java.lang.Object next():572 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.D.b.r:
 com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.D.b.s:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
-    1:3:void <clinit>():112:114 -> <clinit>
-    1:1:void <init>(java.lang.String,int):111:111 -> <init>
+    1:3:void <clinit>():113:115 -> <clinit>
+    1:1:void <init>(java.lang.String,int):112:112 -> <init>
 com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.D.b.t:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1834:1834 -> <clinit>
-    1:1:void <init>():1834:1834 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1834:1834 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1834:1834 -> a
-    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1837:1839 -> a
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1834 -> a
-    5:5:int doHash(java.lang.Object):1834:1834 -> a
-    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1849:1849 -> a
-    6:6:int doHash(java.lang.Object):1834 -> a
+    1:1:void <clinit>():1869:1869 -> <clinit>
+    1:1:void <init>():1869:1869 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1869:1869 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1869:1869 -> a
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1872:1874 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1869 -> a
+    5:5:int doHash(java.lang.Object):1869:1869 -> a
+    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1884:1884 -> a
+    6:6:int doHash(java.lang.Object):1869 -> a
     7:7:int com.android.tools.r8.ir.code.Value.hashCode():760:760 -> a
-    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1850 -> a
-    7:7:int doHash(java.lang.Object):1834 -> a
+    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1885 -> a
+    7:7:int doHash(java.lang.Object):1869 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
     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>():103:104 -> <clinit>
-    1:1:void <init>(java.lang.String,int):102:102 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107 -> a
-    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107:107 -> 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():330:330 -> a
+    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.D.b.w:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
@@ -23352,7 +23384,7 @@
     94:94:boolean hasNext():57:57 -> a
     94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
     95:98:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
-    99:99:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    99:99:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     99:99:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
     100:100:boolean hasPrevious():73:73 -> a
     100:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
@@ -23373,7 +23405,7 @@
     175:175:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
     176:177:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
     178:184:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):448:454 -> a
-    185:185:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    185:185:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     185:185:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
     185:185:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
     186:187:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
@@ -23388,7 +23420,7 @@
     220:220:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     220:220:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489 -> a
     221:221:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):491:491 -> a
-    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     222:222:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
     223: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):492:508 -> a
     240:240:void add(java.lang.Object):28:28 -> a
@@ -23403,7 +23435,7 @@
     261:261:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
     261:261:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
     262:269:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
-    270:270:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    270:270:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     270:270:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
     271:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:553 -> a
     285:285:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23412,7 +23444,7 @@
     288:288:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     288:288:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557 -> a
     289:291:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557:559 -> a
-    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     292:292:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
     293:293:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
     294:294:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
@@ -23427,13 +23459,13 @@
     317:317:java.lang.Object next():28:28 -> a
     317:317:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):578 -> a
     318:332:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):579:593 -> a
-    333:333:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):899:899 -> a
+    333:333:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):897:897 -> a
     333:333:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
     334:347:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
     348:364:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
     348: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):610 -> a
     365:370:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
-    371:371:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    371:371:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     371:371:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
     372:382:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
     383:387:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
@@ -23444,7 +23476,7 @@
     414:414:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
     414:414:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
     415:415:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
-    416:416:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    416:416:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     416:416:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
     417:427:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
     428:428:java.lang.Object previous():28:28 -> a
@@ -23514,13 +23546,13 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> A2
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> C2
-    1:2:int maxInOutValueRegisterSize():82:83 -> D2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> E2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> B2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> D2
+    1:2:int maxInOutValueRegisterSize():82:83 -> E2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> F2
     boolean hasInvariantOutType() -> I0
-    boolean isBinop() -> Y0
+    boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
     9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -23538,8 +23570,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> u2
-    1:1:int maxOutValueRegister():95:95 -> v2
+    1:1:int maxInValueRegister():90:90 -> v2
+    1:1:int maxOutValueRegister():95:95 -> w2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23605,13 +23637,12 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> A2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> B2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> B2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> B2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> C2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isCheckCast() -> Z0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
     2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:70 -> a
     16:16:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
@@ -23622,6 +23653,7 @@
     20:21:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):164:165 -> a
     22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):176:176 -> a
     23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):181:181 -> a
+    boolean isCheckCast() -> a1
     1:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):124:128 -> b
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):130 -> b
@@ -23635,15 +23667,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> B2
+    boolean isCommutative() -> C2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23664,13 +23696,13 @@
     124:130:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):213:219 -> a
     131:131:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):234:234 -> a
     132:132:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
-    boolean isCmp() -> a1
+    boolean isCmp() -> b1
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23684,7 +23716,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> A2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23719,13 +23751,13 @@
     53:53:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
-    boolean isConstClass() -> b1
-    boolean isOutConstant() -> d2
+    boolean isConstClass() -> c1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():72:72 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23734,14 +23766,14 @@
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):54 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isConstInstruction() -> c1
+    boolean isConstInstruction() -> d1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
 com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.D.b.J:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23760,19 +23792,19 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23791,51 +23823,51 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> d2
-    boolean isConstMethodType() -> e1
+    boolean isOutConstant() -> e2
+    boolean isConstMethodType() -> f1
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> A2
-    1:1:double getDoubleValue():92:92 -> B2
-    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> B2
-    2:2:double getDoubleValue():92 -> B2
-    3:4:double getDoubleValue():92:93 -> B2
-    1:1:float getFloatValue():87:87 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> B2
+    1:1:double getDoubleValue():92:92 -> C2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> C2
-    2:2:float getFloatValue():87 -> C2
-    3:4:float getFloatValue():87:88 -> C2
-    1:1:int getIntValue():76:76 -> D2
+    2:2:double getDoubleValue():92 -> C2
+    3:4:double getDoubleValue():92:93 -> C2
+    1:1:float getFloatValue():87:87 -> D2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    2:2:int getIntValue():76 -> D2
-    3:3:int getIntValue():76:76 -> D2
-    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    4:4:int getIntValue():77 -> D2
-    5:5:int getIntValue():77:77 -> D2
-    6:8:int getIntValue():76:78 -> D2
-    1:1:long getLongValue():82:82 -> E2
+    2:2:float getFloatValue():87 -> D2
+    3:4:float getFloatValue():87:88 -> D2
+    1:1:int getIntValue():76:76 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2:long getLongValue():82 -> E2
-    3:4:long getLongValue():82:83 -> E2
-    1:1:long getRawValue():97:97 -> F2
-    1:1:boolean is16Bit():273:273 -> G2
-    1:1:boolean is8Bit():265:265 -> H2
-    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> I2
-    1:1:boolean isIntegerOne():109 -> I2
-    2:2:boolean isIntegerOne():109:109 -> I2
+    2:2:int getIntValue():76 -> E2
+    3:3:int getIntValue():76:76 -> E2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
+    4:4:int getIntValue():77 -> E2
+    5:5:int getIntValue():77:77 -> E2
+    6:8:int getIntValue():76:78 -> E2
+    1:1:long getLongValue():82:82 -> F2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    2:2:long getLongValue():82 -> F2
+    3:4:long getLongValue():82:83 -> F2
+    1:1:long getRawValue():97:97 -> G2
+    1:1:boolean is16Bit():273:273 -> H2
+    1:1:boolean is8Bit():265:265 -> I2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> J2
-    1:1:boolean isIntegerZero():105 -> J2
-    2:2:boolean isIntegerZero():105:105 -> J2
-    1:1:boolean isZero():101:101 -> K2
-    1:1:boolean negativeIs16Bit():277:277 -> L2
-    1:1:boolean negativeIs8Bit():269:269 -> M2
+    1:1:boolean isIntegerOne():109 -> J2
+    2:2:boolean isIntegerOne():109:109 -> J2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
+    1:1:boolean isIntegerZero():105 -> K2
+    2:2:boolean isIntegerZero():105:105 -> K2
+    1:1:boolean isZero():101:101 -> L2
+    1:1:boolean negativeIs16Bit():277:277 -> M2
+    1:1:boolean negativeIs8Bit():269:269 -> N2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23918,23 +23950,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> d2
-    boolean isConstNumber() -> f1
+    boolean isOutConstant() -> e2
+    boolean isConstNumber() -> g1
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:2:java.lang.String toString():245:246 -> toString
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     3:3:java.lang.String toString():246 -> toString
     4:6:java.lang.String toString():246:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():234:234 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> A2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -23958,7 +23990,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -23966,13 +23998,13 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isConstString() -> g1
+    boolean isOutConstant() -> e2
+    boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():74:74 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -23992,6 +24024,7 @@
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24001,18 +24034,20 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalRead():96:96 -> 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):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalRead() -> k1
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isDebugLocalRead() -> l1
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    boolean isDebugLocalUninitialized() -> l1
+    boolean isDebugLocalUninitialized() -> m1
 com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.D.b.Q:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:30 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> a
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
@@ -24023,8 +24058,8 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> d2
-    boolean isDebugLocalWrite() -> m1
+    boolean isOutConstant() -> e2
+    boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
     boolean $assertionsDisabled -> j
@@ -24032,9 +24067,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> A2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> a
@@ -24050,17 +24086,18 @@
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):124:124 -> a
     19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalsChange() -> n1
+    boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
-    1:1:int maxInValueRegister():77:77 -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxOutValueRegister():82:82 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():77:77 -> v2
+    1:1:int maxOutValueRegister():82:82 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24070,11 +24107,11 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():104:104 -> 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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugPosition() -> o1
-    1:1:int maxInValueRegister():55:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
+    boolean isDebugPosition() -> p1
+    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24096,8 +24133,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> A2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> B2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24128,17 +24165,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isDexItemBasedConstString() -> p1
+    boolean isOutConstant() -> e2
+    boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():97:97 -> v2
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24157,8 +24194,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isDiv() -> q1
-    int opcode() -> w2
+    boolean isDiv() -> r1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
@@ -24218,19 +24255,19 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> A2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> A2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> A2
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> A2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> A2
-    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> A2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> B2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> B2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> B2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> B2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> B2
-    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> B2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> B2
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> D2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24241,10 +24278,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-    boolean isDup() -> r1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():92:92 -> v2
-    int opcode() -> w2
+    boolean isDup() -> s1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():92:92 -> w2
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Dup asDup() -> z
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.D.b.b0:
     boolean $assertionsDisabled -> h
@@ -24261,10 +24298,10 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):112 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-    boolean isDup2() -> s1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    boolean isDup2() -> t1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -24272,9 +24309,9 @@
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> A2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> B2
-    com.android.tools.r8.ir.code.Value value() -> C2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> B2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
+    com.android.tools.r8.ir.code.Value value() -> D2
     boolean hasInvariantOutType() -> I0
     1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
     25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():124:124 -> a
@@ -24290,7 +24327,7 @@
     7:7:com.android.tools.r8.graph.DexField getField():43:43 -> d
     7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> d
     8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:164 -> d
-    boolean isFieldInstruction() -> u1
+    boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.D.b.e0:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
@@ -24339,7 +24376,8 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> C2
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
@@ -24347,7 +24385,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():895 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24360,14 +24398,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():895:895 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893:893 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():65:65 -> v2
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():65:65 -> w2
+    boolean isGoto() -> x1
+    int opcode() -> x2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24383,64 +24421,69 @@
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):119:119 -> <init>
     2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):99:129 -> <init>
-    1:12:boolean verifyNoImpreciseOrBottomTypes():806:817 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():821:828 -> B
+    1:12:boolean verifyNoImpreciseOrBottomTypes():804:815 -> A
+    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
     1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    1:6:boolean computeAllThrowingInstructionsHavePositions():998:1003 -> D
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():832:843 -> E
+    1:6:boolean computeAllThrowingInstructionsHavePositions():996:1001 -> D
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():830:841 -> E
     1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):265:281 -> a
     18:22:void ensureBlockNumbering():386:390 -> a
     18:22:void print(com.android.tools.r8.utils.CfgPrinter):492 -> a
     23:24:void print(com.android.tools.r8.utils.CfgPrinter):493:494 -> a
     25:25:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):544:544 -> a
     26:26:void lambda$consistentBlockNumbering$1(java.lang.Integer,java.lang.Long):699:699 -> a
-    27:33:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):808:814 -> a
-    34:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):813:813 -> a
-    35:38:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):850:853 -> a
-    39:42:boolean verifySSATypeLattice(java.util.function.Predicate):859:862 -> a
+    27:33:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):806:812 -> a
+    34:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):811:811 -> a
+    35:38:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):848:851 -> a
+    39:42:boolean verifySSATypeLattice(java.util.function.Predicate):857:860 -> a
     43:43:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    43:43:boolean verifySSATypeLattice(java.util.function.Predicate):862 -> a
-    44:48:boolean verifySSATypeLattice(java.util.function.Predicate):862:866 -> a
-    49:50:java.util.List collectArguments(boolean):929:930 -> a
-    49:50:java.util.List collectArguments():925 -> a
-    51:51:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> a
-    51:51:java.util.List collectArguments(boolean):930 -> a
-    51:51:java.util.List collectArguments():925 -> a
-    52:55:java.util.List collectArguments(boolean):931:934 -> a
-    52:55:java.util.List collectArguments():925 -> a
+    43:43:boolean verifySSATypeLattice(java.util.function.Predicate):860 -> a
+    44:48:boolean verifySSATypeLattice(java.util.function.Predicate):860:864 -> a
+    49:50:java.util.List collectArguments(boolean):927:928 -> a
+    49:50:java.util.List collectArguments():923 -> a
+    51:51:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> a
+    51:51:java.util.List collectArguments(boolean):928 -> a
+    51:51:java.util.List collectArguments():923 -> a
+    52:55:java.util.List collectArguments(boolean):929:932 -> a
+    52:55:java.util.List collectArguments():923 -> a
     56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    56:56:java.util.List collectArguments(boolean):934 -> a
-    56:56:java.util.List collectArguments():925 -> a
-    57:62:java.util.List collectArguments(boolean):936:941 -> a
-    57:62:java.util.List collectArguments():925 -> a
-    63:63:java.util.List collectArguments(boolean):940:940 -> a
-    63:63:java.util.List collectArguments():925 -> a
-    64:64:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> a
-    64:64:java.util.List collectArguments(boolean):930 -> a
-    64:64:java.util.List collectArguments():925 -> a
-    65:65:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):957:957 -> a
-    66:66:void setAllThrowingInstructionsHavePositions(boolean):994:994 -> a
-    67:70:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1023:1026 -> a
-    71:72:boolean anyBlocksMarkedWithColor(int):1066:1067 -> a
-    73:73:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1079 -> a
-    74:82:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1104:1112 -> a
-    74:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1080 -> a
-    83:88:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1081:1086 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    89:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1086 -> a
-    90:96:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1087:1093 -> a
-    97:97:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    97:97:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1093 -> a
-    98:98:void markTransitiveSuccessors(java.util.Deque,int):1151:1151 -> a
-    99:99:boolean isMarkingColorInUse(int):1062:1062 -> a
-    99:99:void markTransitiveSuccessors(java.util.Deque,int):1151 -> a
-    100:109:void markTransitiveSuccessors(java.util.Deque,int):1151:1160 -> a
-    110:110:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1172 -> a
-    111:111:boolean isMarkingColorInUse(int):1062:1062 -> a
-    111:111:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172 -> a
-    112:123:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1183 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> a
-    124:124:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1091 -> a
+    56:56:java.util.List collectArguments(boolean):932 -> a
+    56:56:java.util.List collectArguments():923 -> a
+    57:62:java.util.List collectArguments(boolean):934:939 -> a
+    57:62:java.util.List collectArguments():923 -> a
+    63:63:java.util.List collectArguments(boolean):938:938 -> a
+    63:63:java.util.List collectArguments():923 -> a
+    64:64:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> a
+    64:64:java.util.List collectArguments(boolean):928 -> a
+    64:64:java.util.List collectArguments():923 -> a
+    65:65:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):955:955 -> a
+    66:66:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963:963 -> a
+    67:67:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    67:67:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963 -> a
+    68:68:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):964:964 -> a
+    69:69:void setAllThrowingInstructionsHavePositions(boolean):992:992 -> a
+    70:73:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1021:1024 -> a
+    74:74:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1077:1077 -> a
+    75:83:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1102:1110 -> a
+    75:83:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1078 -> a
+    84:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1084 -> a
+    90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1084 -> a
+    91:97:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1085:1091 -> a
+    98:98:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    98:98:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1091 -> a
+    99:99:void markTransitiveSuccessors(java.util.Deque,int):1149:1149 -> a
+    100:100:boolean isMarkingColorInUse(int):1060:1060 -> a
+    100:100:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    101:102:boolean anyBlocksMarkedWithColor(int):1064:1065 -> a
+    101:102:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    103:112:void markTransitiveSuccessors(java.util.Deque,int):1149:1158 -> a
+    113:113:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1170 -> a
+    114:114:boolean isMarkingColorInUse(int):1060:1060 -> a
+    114:114:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170 -> a
+    115:126:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1181 -> a
+    127:127:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> a
+    127:127:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1089 -> a
     1:52:java.util.Map computeLiveAtEntrySets():149:200 -> b
     53:56:java.util.Map computeLiveAtEntrySets():199:202 -> b
     57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
@@ -24456,64 +24499,60 @@
     111:111:java.util.Map computeLiveAtEntrySets():258 -> b
     112:114:java.util.Map computeLiveAtEntrySets():258:260 -> b
     115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):509:519 -> b
-    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:825 -> b
-    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:823 -> b
-    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):847:847 -> b
-    131:131:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965:965 -> b
-    132:132:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    132:132:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965 -> b
-    133:133:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):966:966 -> b
-    134:134:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1191:1191 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:823 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:821 -> b
+    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):845:845 -> b
+    131:131:boolean isMarkingColorInUse(int):1060:1060 -> b
+    132:132:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1189:1189 -> b
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):540:541 -> c
     3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):549:552 -> c
     3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):541 -> c
     7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):542:544 -> c
-    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:839 -> c
-    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:840 -> c
-    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):835:835 -> c
-    24:30:java.util.List computeNormalExitBlocks():885:891 -> c
-    31:31:boolean isMarkingColorInUse(int):1062:1062 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:837 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:838 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):833:833 -> c
+    24:30:java.util.List computeNormalExitBlocks():883:889 -> c
+    31:31:java.util.ListIterator listIterator(int):897:897 -> c
     1:4:boolean consistentBlockNumbering():694:697 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):838:838 -> d
-    6:6:java.util.ListIterator listIterator(int):899:899 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():980:980 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():980 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():981:981 -> e
-    4:4:void returnMarkingColor(int):1056:1056 -> e
-    5:5:boolean isMarkingColorInUse(int):1062:1062 -> e
-    5:5:void returnMarkingColor(int):1056 -> e
-    6:6:void returnMarkingColor(int):1056:1056 -> e
-    7:8:void clearMarks(int):407:408 -> e
-    7:8:void returnMarkingColor(int):1057 -> e
-    9:9:void returnMarkingColor(int):1058:1058 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():990:990 -> f
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):836:836 -> d
+    6:6:void returnMarkingColor(int):1054:1054 -> d
+    7:7:boolean isMarkingColorInUse(int):1060:1060 -> d
+    7:7:void returnMarkingColor(int):1054 -> d
+    8:8:void returnMarkingColor(int):1054:1054 -> d
+    9:10:void clearMarks(int):407:408 -> d
+    9:10:void returnMarkingColor(int):1055 -> d
+    11:11:void returnMarkingColor(int):1056:1056 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():978:978 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():978 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():979:979 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():988:988 -> f
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191:1191 -> h
-    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> h
-    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191 -> h
-    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191:1204 -> h
-    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> h
-    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191 -> h
-    1:1:int getHighestBlockNumber():970:970 -> i
-    1:1:int getNextInstructionNumber():921:921 -> j
-    1:4:com.android.tools.r8.ir.code.Value getThis():946:949 -> k
-    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> k
-    5:5:com.android.tools.r8.ir.code.Value getThis():949 -> k
-    6:8:com.android.tools.r8.ir.code.Value getThis():949:951 -> k
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189:1189 -> h
+    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189:1202 -> h
+    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> h
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189 -> h
+    1:1:int getHighestBlockNumber():968:968 -> i
+    1:1:int getNextInstructionNumber():919:919 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():944:947 -> k
+    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():947 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():947:949 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():951 -> k
-    10:10:com.android.tools.r8.ir.code.Value getThis():952:952 -> k
-    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> k
-    11:11:com.android.tools.r8.ir.code.Value getThis():949 -> k
-    1:3:java.util.Set getUnreachableBlocks():1117:1119 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> l
-    4:4:java.util.Set getUnreachableBlocks():1119 -> l
-    5:10:java.util.Set getUnreachableBlocks():1120:1125 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():877:877 -> m
-    1:1:java.lang.Iterable instructions():873:873 -> n
+    9:9:com.android.tools.r8.ir.code.Value getThis():949 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():950:950 -> k
+    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> k
+    11:11:com.android.tools.r8.ir.code.Value getThis():947 -> k
+    1:3:java.util.Set getUnreachableBlocks():1115:1117 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> l
+    4:4:java.util.Set getUnreachableBlocks():1117 -> l
+    5:10:java.util.Set getUnreachableBlocks():1118:1123 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():875:875 -> m
+    1:1:java.lang.Iterable instructions():871:871 -> n
     1:1:boolean isConsistentGraph():527:527 -> o
-    2:2:boolean noColorsInUse():1075:1075 -> o
+    2:2:boolean noColorsInUse():1073:1073 -> o
     2:2:boolean isConsistentGraph():527 -> o
     3:5:boolean isConsistentGraph():527:529 -> o
     6:21:boolean consistentPredecessorSuccessors():665:680 -> o
@@ -24580,47 +24619,47 @@
     49:57:boolean consistentDefUseChains():624 -> p
     49:57:boolean isConsistentSSA():500 -> p
     58:58:boolean isConsistentSSA():501:501 -> p
-    59:76:boolean validThrowingInstructions():780:797 -> p
-    59:76:boolean isConsistentSSA():501 -> p
-    77:77:boolean isConsistentSSA():502:502 -> p
-    78:89:boolean noCriticalEdges():560:571 -> p
-    78:89:boolean isConsistentSSA():502 -> p
-    90:92:boolean isConsistentSSA():502:504 -> p
-    1:1:java.util.ListIterator listIterator():895:895 -> q
+    59:75:boolean validThrowingInstructions():780:796 -> p
+    59:75:boolean isConsistentSSA():501 -> p
+    76:76:boolean isConsistentSSA():502:502 -> p
+    77:88:boolean noCriticalEdges():560:571 -> p
+    77:88:boolean isConsistentSSA():502 -> p
+    89:91:boolean isConsistentSSA():502:504 -> p
+    1:1:java.util.ListIterator listIterator():893:893 -> q
     1:1:com.android.tools.r8.ir.code.IRMetadata metadata():133:133 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():903:905 -> s
-    1:7:int numberRemainingInstructions():911:917 -> t
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():901:903 -> s
+    1:7:int numberRemainingInstructions():909:915 -> t
     1:7:java.lang.String toString():397:403 -> toString
-    1:1:void removeAllTrivialPhis():1011:1011 -> u
-    1:3:java.util.Set removeUnreachableBlocks():1130:1132 -> v
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> v
-    4:4:java.util.Set removeUnreachableBlocks():1132 -> v
+    1:1:void removeAllTrivialPhis():1009:1009 -> u
+    1:3:java.util.Set removeUnreachableBlocks():1128:1130 -> v
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> v
+    4:4:java.util.Set removeUnreachableBlocks():1130 -> v
     5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> v
-    5:5:java.util.ListIterator listIterator():895 -> v
-    5:5:java.util.Set removeUnreachableBlocks():1133 -> v
+    5:5:java.util.ListIterator listIterator():893 -> v
+    5:5:java.util.Set removeUnreachableBlocks():1131 -> v
     6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> v
-    6:6:java.util.Set removeUnreachableBlocks():1134 -> v
+    6:6:java.util.Set removeUnreachableBlocks():1132 -> v
     7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> v
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> v
-    7:7:java.util.Set removeUnreachableBlocks():1135 -> v
-    8:9:java.util.Set removeUnreachableBlocks():1136:1137 -> v
+    7:7:java.util.Set removeUnreachableBlocks():1133 -> v
+    8:9:java.util.Set removeUnreachableBlocks():1134:1135 -> v
     10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> v
-    10:11:java.util.Set removeUnreachableBlocks():1138 -> v
+    10:11:java.util.Set removeUnreachableBlocks():1136 -> v
     12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> v
     12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> v
-    12:12:java.util.Set removeUnreachableBlocks():1138 -> v
+    12:12:java.util.Set removeUnreachableBlocks():1136 -> v
     13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> v
     13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> v
-    13:13:java.util.Set removeUnreachableBlocks():1138 -> v
+    13:13:java.util.Set removeUnreachableBlocks():1136 -> v
     14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> v
-    14:17:java.util.Set removeUnreachableBlocks():1138 -> v
-    18:19:java.util.Set removeUnreachableBlocks():1141:1142 -> v
-    1:1:int reserveMarkingColor():1032:1032 -> w
-    2:2:boolean anyMarkingColorAvailable():1046:1046 -> w
-    2:2:int reserveMarkingColor():1032 -> w
-    3:11:int reserveMarkingColor():1032:1040 -> w
+    14:17:java.util.Set removeUnreachableBlocks():1136 -> v
+    18:19:java.util.Set removeUnreachableBlocks():1139:1140 -> v
+    1:1:int reserveMarkingColor():1030:1030 -> w
+    2:2:boolean anyMarkingColorAvailable():1044:1044 -> w
+    2:2:int reserveMarkingColor():1030 -> w
+    3:11:int reserveMarkingColor():1030:1038 -> w
     12:13:boolean verifyNoBlocksMarked(int):423:424 -> w
-    12:13:int reserveMarkingColor():1040 -> w
+    12:13:int reserveMarkingColor():1038 -> w
     1:24:void splitCriticalEdges():290:313 -> x
     25:34:void splitCriticalEdges():312:321 -> x
     1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():448:471 -> y
@@ -24630,7 +24669,7 @@
     26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():443 -> y
     1:20:void traceBlocks():352:371 -> z
     21:33:void traceBlocks():370:382 -> z
-    34:34:boolean noColorsInUse():1075:1075 -> z
+    34:34:boolean noColorsInUse():1073:1073 -> z
     34:34:void traceBlocks():382 -> z
     35:35:void traceBlocks():382:382 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
@@ -24767,18 +24806,18 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> A2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> C2
-    1:2:void invert():110:111 -> D2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> D2
-    3:4:void invert():112 -> D2
-    5:5:void invert():113:113 -> D2
-    1:1:boolean isZeroTest():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> F2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> G2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> H2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> C2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> D2
+    1:2:void invert():110:111 -> E2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> E2
+    3:4:void invert():112 -> E2
+    5:5:void invert():113:113 -> E2
+    1:1:boolean isZeroTest():93:93 -> F2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> G2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> H2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> I2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -24809,10 +24848,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> u2
-    1:1:int maxOutValueRegister():179:179 -> v2
-    int opcode() -> w2
-    boolean isIf() -> x1
+    1:1:int maxInValueRegister():174:174 -> v2
+    1:1:int maxOutValueRegister():179:179 -> w2
+    int opcode() -> x2
+    boolean isIf() -> y1
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -24847,18 +24886,19 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> D2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -24889,16 +24929,16 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceGet() -> y1
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
+    boolean isInstanceGet() -> z1
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.D.b.s0:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> A2
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> B2
+    boolean isInstanceOf() -> A1
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> C2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -24913,18 +24953,18 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceOf() -> z1
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean isInstancePut() -> A1
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> C2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> D2
+    boolean isInstancePut() -> B1
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
@@ -24949,10 +24989,9 @@
     1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():170:170 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():170:170 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -24969,85 +25008,86 @@
     26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):45:67 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():591:591 -> A0
-    boolean isInstancePut() -> A1
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
+    boolean isInstanceOf() -> A1
+    boolean throwsOnNullInput() -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1353:1353 -> B0
-    boolean isIntSwitch() -> B1
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    boolean isInstancePut() -> B1
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
-    boolean isIntroducingAnAlias() -> C1
+    boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
-    boolean isInvoke() -> D1
+    boolean isIntroducingAnAlias() -> D1
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     1:2:com.android.tools.r8.ir.code.Position getPosition():79:80 -> E0
-    boolean isInvokeCustom() -> E1
+    boolean isInvoke() -> E1
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     1:1:java.lang.String getPositionAsString():89:89 -> F0
-    boolean isInvokeDirect() -> F1
+    boolean isInvokeCustom() -> F1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
     1:1:boolean hasBlock():289:289 -> G0
-    boolean isInvokeInterface() -> G1
+    boolean isInvokeDirect() -> G1
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     1:1:java.util.List inValues():93:93 -> H0
     1:1:boolean hasInValueWithLocalInfo():107 -> H0
     2:3:boolean hasInValueWithLocalInfo():107:108 -> H0
-    boolean isInvokeMethod() -> H1
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMethodWithReceiver() -> I1
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokePolymorphic() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:boolean instructionInstanceCanThrow():520:520 -> M0
-    boolean isInvokeStatic() -> M1
+    1:1:boolean instructionInstanceCanThrow():524:524 -> M0
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokeSuper() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeVirtual() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    boolean isAnd() -> P0
-    boolean isJumpInstruction() -> P1
+    boolean isAllowedAfterThrowingInstruction() -> P0
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    boolean isArgument() -> Q0
-    boolean isLoad() -> Q1
+    boolean isAnd() -> Q0
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    boolean isArithmeticBinop() -> R0
-    boolean isLogicalBinop() -> R1
+    boolean isArgument() -> R0
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    boolean isArrayGet() -> S0
-    boolean isMonitor() -> S1
+    boolean isArithmeticBinop() -> S0
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
-    boolean isArrayLength() -> T0
-    boolean isMove() -> T1
+    boolean isArrayGet() -> T0
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
-    boolean isArrayPut() -> U0
-    boolean isMoveException() -> U1
+    boolean isArrayLength() -> U0
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
-    boolean isAssume() -> V0
-    boolean isMul() -> V1
+    boolean isArrayPut() -> V0
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
-    boolean isAssumeDynamicType() -> W0
-    boolean isNeg() -> W1
+    boolean isAssume() -> W0
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
-    boolean isAssumeNonNull() -> X0
-    boolean isNewArrayEmpty() -> X1
+    boolean isAssumeDynamicType() -> X0
+    boolean isNeg() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
-    boolean isBinop() -> Y0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isAssumeNonNull() -> Y0
+    boolean isNewArrayEmpty() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
-    boolean isCheckCast() -> Z0
-    boolean isNewInstance() -> Z1
+    boolean isBinop() -> Z0
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -25105,130 +25145,130 @@
     175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
     175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
-    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):542:542 -> a
-    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1289:1290 -> a
-    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1296:1299 -> a
-    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1304:1306 -> a
-    194:200:boolean verifyValidPositionInfo(boolean):1373:1379 -> a
-    201:201:boolean verifyValidPositionInfo(boolean):1375:1375 -> a
+    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1297:1298 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1304:1307 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1312:1314 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1381:1387 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1383:1383 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    boolean isCmp() -> a1
-    boolean isNot() -> a2
+    boolean isCheckCast() -> a1
+    boolean isNewInstance() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     9:15:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):202:208 -> b
     16:16:void printLIR(com.android.tools.r8.utils.CfgPrinter):338:338 -> b
-    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):524:524 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1311:1322 -> b
+    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):528:528 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
-    boolean isConstClass() -> b1
-    boolean isNumberConversion() -> b2
+    boolean isCmp() -> b1
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    boolean isConstInstruction() -> c1
-    boolean isOr() -> c2
+    boolean isConstClass() -> c1
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
-    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):550:554 -> d
+    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstInstruction() -> d1
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    boolean isConstMethodType() -> e1
-    boolean isPop() -> e2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    boolean isConstNumber() -> f1
-    boolean isRem() -> f2
+    boolean isConstMethodType() -> f1
+    boolean isPop() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    boolean isConstString() -> g1
-    boolean isReturn() -> g2
+    boolean isConstNumber() -> g1
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    1:4:boolean isCreatingArray():1268:1271 -> h1
-    boolean isShl() -> h2
+    boolean isConstString() -> h1
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:1:boolean isCreatingInstanceOrArray():1275:1275 -> i1
-    boolean isShr() -> i2
+    1:4:boolean isCreatingArray():1276:1279 -> i1
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:5:boolean isDebugInstruction():1076:1080 -> j1
-    boolean isStaticGet() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    boolean isDebugLocalRead() -> k1
-    boolean isStaticPut() -> k2
+    1:5:boolean isDebugInstruction():1080:1084 -> k1
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isDebugLocalUninitialized() -> l1
-    boolean isStore() -> l2
+    boolean isDebugLocalRead() -> l1
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isDebugLocalWrite() -> m1
-    boolean isStringSwitch() -> m2
+    boolean isDebugLocalUninitialized() -> m1
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isDebugLocalsChange() -> n1
-    boolean isSub() -> n2
+    boolean isDebugLocalWrite() -> n1
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isDebugPosition() -> o1
-    boolean isSwap() -> o2
+    boolean isDebugLocalsChange() -> o1
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    boolean isDexItemBasedConstString() -> p1
-    boolean isSwitch() -> p2
+    boolean isDebugPosition() -> p1
+    boolean isSwap() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isDiv() -> q1
-    boolean isThrow() -> q2
+    boolean isDexItemBasedConstString() -> q1
+    boolean isSwitch() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isDup() -> r1
-    boolean isUnop() -> r2
+    boolean isDiv() -> r1
+    boolean isThrow() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isDup2() -> s1
-    boolean isUshr() -> s2
+    boolean isDup() -> s1
+    boolean isUnop() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    1:1:boolean isFieldGet():852:852 -> t1
-    boolean isXor() -> t2
+    boolean isDup2() -> t1
+    boolean isUshr() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
-    boolean isFieldInstruction() -> u1
-    int maxInValueRegister() -> u2
+    1:1:boolean isFieldGet():856:856 -> u1
+    boolean isXor() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
-    1:1:boolean isFieldPut():856:856 -> v1
-    int maxOutValueRegister() -> v2
+    boolean isFieldInstruction() -> v1
+    int maxInValueRegister() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1263:1263 -> w0
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:boolean isFieldPut():860:860 -> w1
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
-    boolean isIf() -> x1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> x2
+    boolean isGoto() -> x1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    1:1:java.util.Set getDebugValues():595:595 -> y0
-    boolean isInstanceGet() -> y1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> y2
+    1:1:java.util.Set getDebugValues():599:599 -> y0
+    boolean isIf() -> y1
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
-    boolean isInstanceOf() -> z1
-    boolean throwsOnNullInput() -> z2
+    boolean isInstanceGet() -> z1
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
     java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate) -> a
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):18:20 -> a
@@ -25251,15 +25291,15 @@
     int[] keys -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
-    boolean isIntSwitch() -> B1
-    1:7:boolean valid():55:61 -> E2
+    boolean isIntSwitch() -> C1
+    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:1:int getFirstKey():177:177 -> G2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> H2
-    3:3:int getKey(int):206:206 -> H2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> H2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> H2
-    1:1:int[] getKeys():210:210 -> I2
+    1:1:int getFirstKey():177:177 -> H2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> I2
+    3:3:int getKey(int):206:206 -> I2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> I2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> I2
+    1:1:int[] getKeys():210:210 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25309,33 +25349,33 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> A2
-    com.android.tools.r8.graph.DexType getReturnType() -> B2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> C2
-    boolean isInvoke() -> D1
-    java.lang.String getTypeString() -> D2
-    1:1:int requiredArgumentRegisters():108:108 -> E2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> E2
-    2:2:int requiredArgumentRegisters():109 -> E2
-    1:1:java.util.List arguments():103:103 -> F2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> F2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> F2
-    3:3:java.util.List arguments():103:103 -> F2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> F2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> F2
-    6:6:java.util.List arguments():103:103 -> F2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> F2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> F2
-    8:8:java.util.List arguments():103:103 -> F2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> F2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> F2
+    1:1:java.util.List arguments():103:103 -> B2
+    com.android.tools.r8.graph.DexType getReturnType() -> C2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    boolean isInvoke() -> E1
+    java.lang.String getTypeString() -> E2
+    1:1:int requiredArgumentRegisters():108:108 -> F2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> F2
+    2:2:int requiredArgumentRegisters():109 -> F2
+    1:1:java.util.List arguments():103:103 -> G2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> G2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> G2
+    3:3:java.util.List arguments():103:103 -> G2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> G2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> G2
+    6:6:java.util.List arguments():103:103 -> G2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> G2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> G2
+    8:8:java.util.List arguments():103:103 -> G2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> G2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
@@ -25399,10 +25439,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> u2
-    1:1:int maxInValueRegister():213 -> u2
-    2:4:int maxInValueRegister():213:215 -> u2
-    int maxOutValueRegister() -> v2
+    1:1:java.util.List arguments():103:103 -> v2
+    1:1:int maxInValueRegister():213 -> v2
+    2:4:int maxInValueRegister():213:215 -> v2
+    int maxOutValueRegister() -> w2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25430,11 +25470,11 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):30:32 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeCustom() -> E1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> F2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeCustom() -> F1
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -25474,16 +25514,16 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():120 -> toString
     3:3:java.lang.String toString():120:120 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():35:35 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeDirect() -> F1
-    1:1:boolean isInterface():57:57 -> H2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeDirect() -> G1
+    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
@@ -25506,87 +25546,87 @@
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):287:300 -> d
     1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128:143 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:28 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeInterface() -> G1
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):117:117 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):122:122 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):132:132 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:99 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:111 -> f
-    int opcode() -> w2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> B2
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> F2
-    boolean isInvokeMethod() -> H1
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():34:34 -> C2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():38:38 -> G2
     boolean hasInvariantOutType() -> I0
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42 -> a
-    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:80 -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43:43 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():38:38 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):78:83 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85:85 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86:87 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87:87 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):98:106 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):117:117 -> a
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):82 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:109 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():47:47 -> toString
+    1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():60:60 -> B0
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():36:37 -> G2
-    boolean isInvokeMethodWithReceiver() -> I1
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):24:24 -> <init>
+    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():65:65 -> B0
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():38:39 -> H2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):45:45 -> a
-    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):65:79 -> b
-    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):78:78 -> b
-    boolean throwsOnNullInput() -> z2
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):49:49 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):55:55 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):70:84 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):83:83 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.D.b.G0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> F2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> G2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> G2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> G2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> H2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> H2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
@@ -25601,7 +25641,7 @@
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
     11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
     12:15:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:120 -> a
-    16:16:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     16:16:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120 -> a
     17:51:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:154 -> a
     52:52:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186:186 -> a
@@ -25612,20 +25652,20 @@
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176 -> b
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> F2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> G2
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -25637,7 +25677,7 @@
     25:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
     26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
     27:30:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:147 -> a
-    31:31:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    31:31:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     31:31:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> a
     32:68:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:183 -> a
     69:69:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):199:199 -> a
@@ -25649,70 +25689,70 @@
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46:46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():51:51 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexProto getProto():60:60 -> G2
-    boolean isInvokePolymorphic() -> L1
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):32:33 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():48:48 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexProto getProto():62:62 -> H2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:72 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:78 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:86 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):91:97 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97:98 -> a
-    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):103:105 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):142:142 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):180:180 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134 -> a
-    40:40:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
-    40:40:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:80 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:88 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:99 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:100 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:107 -> a
+    38:40:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:150 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):180:180 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):136 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
+    42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeStatic() -> M1
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():58:58 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:86 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137:137 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):145:145 -> a
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):207:207 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218:218 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):166:203 -> b
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:121 -> e
-    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:131 -> f
-    int opcode() -> w2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:87 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138:138 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:148 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):158:158 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):168:168 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):215:215 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):226:226 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):174:211 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:122 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:132 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):30:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeSuper() -> N1
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
     20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
@@ -25723,40 +25763,40 @@
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):31:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeVirtual() -> O1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):120:120 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):192:192 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:151 -> b
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:158 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):151 -> b
-    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:181 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:102 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):98:98 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):110:114 -> f
-    int opcode() -> w2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):158 -> b
+    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):164:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> A2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> P1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -25794,9 +25834,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.D.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> Q1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -25808,15 +25848,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():61:61 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():61:61 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> F2
-    boolean isLogicalBinop() -> R1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -25856,33 +25896,19 @@
     52:53:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):40:41 -> a
     54:55:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):35:36 -> a
     56:56:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):30:30 -> a
-    57:57:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103:103 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):98:98 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):96:96 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):84:84 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):79:92 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):88:94 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):86:86 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):82:82 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
 com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.D.b.S0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
-    1:1:boolean isEnter():50:50 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> B2
+    1:1:boolean isEnter():50:50 -> B2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> S1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -25893,11 +25919,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
     1:7:java.lang.String getInstructionName():114:120 -> z0
-    boolean throwsOnNullInput() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.D.b.R0:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -25909,11 +25934,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> A2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> B2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> T1
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -25925,23 +25950,23 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> d2
+    1:1:boolean isOutConstant():81:81 -> e2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> A2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> U1
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -25961,14 +25986,14 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():51:51 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> F2
-    boolean isMul() -> V1
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -25986,13 +26011,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> W1
+    boolean isNeg() -> X1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -26005,17 +26030,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> A2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> X1
+    boolean isNewArrayEmpty() -> Y1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -26033,12 +26058,12 @@
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():41 -> toString
     3:3:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26046,10 +26071,10 @@
     int element_width -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):30:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
@@ -26065,9 +26090,9 @@
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():83:83 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():83:83 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -26075,12 +26100,11 @@
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> A2
-    1:1:boolean isSpillingAllowed():184:184 -> B2
-    1:1:void markNoSpilling():180:180 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> B2
+    1:1:boolean isSpillingAllowed():184:184 -> C2
+    1:1:void markNoSpilling():180:180 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewInstance() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
@@ -26096,6 +26120,7 @@
     12:12:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):131:131 -> a
     13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
     14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
+    boolean isNewInstance() -> a2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
     1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):205 -> b
     2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):205:208 -> b
@@ -26109,9 +26134,9 @@
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():68:68 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26127,9 +26152,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> a2
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26158,9 +26183,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> b2
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26189,8 +26214,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26201,10 +26226,10 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    boolean isOr() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26273,13 +26298,13 @@
     7:7:void setIsStackPhi(boolean):350:350 -> b
     8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
     1:1:void clearDefinitionsUsers():335:335 -> b0
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> c
-    2:2:java.util.List getOperands():171:171 -> c
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> c
-    3:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> c
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> d
+    3:3:java.util.List getOperands():171:171 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> d
+    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> d
     1:1:java.util.List getOperands():171:171 -> d0
     1:1:boolean isTrivialPhi():212:212 -> e0
     1:9:java.lang.String printPhi():302:310 -> f0
@@ -26315,10 +26340,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> e2
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isPop() -> f2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26345,8 +26370,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26365,17 +26390,17 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isRem() -> f2
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> B2
-    1:1:boolean isReturnVoid():42:42 -> C2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> D2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
+    1:1:boolean isReturnVoid():42:42 -> D2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26387,15 +26412,15 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> 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):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
-    boolean isReturn() -> g2
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():97:97 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():97:97 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26407,13 +26432,13 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShl() -> h2
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26425,9 +26450,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShr() -> i2
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26465,8 +26490,8 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> C2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26497,52 +26522,64 @@
     110:110:boolean lambda$instructionMayTriggerMethodInvocation$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):220:220 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
-    boolean isStaticGet() -> j2
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> C2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> D2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):138:139 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):157:167 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):161 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:181 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):187:187 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):207:207 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:214 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:212 -> 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):224:224 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):237:237 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:123 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):230:234 -> c
-    boolean isStaticPut() -> k2
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:34:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:145 -> b
+    30:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
+    36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():151:151 -> v2
-    int opcode() -> w2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():190:190 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26559,17 +26596,17 @@
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):68 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
-    boolean isStore() -> l2
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():57:57 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> E2
+    1:4:boolean valid():44:47 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26579,22 +26616,22 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-    boolean isStringSwitch() -> m2
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():101:101 -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> B2
-    1:8:int maxInOutValueRegisterSize():131:138 -> D2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> F2
+    boolean isCommutative() -> C2
+    1:8:int maxInOutValueRegisterSize():131:138 -> E2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26618,9 +26655,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
-    boolean isSub() -> n2
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26636,29 +26673,29 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):93 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> o2
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    boolean isSwap() -> p2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> A2
-    1:1:int getFallthroughBlockIndex():55:55 -> B2
-    1:1:int numberOfKeys():68:68 -> C2
-    1:1:int[] targetBlockIndices():40:40 -> D2
-    1:1:int numberOfKeys():68:68 -> E2
-    1:1:boolean valid():25 -> E2
-    2:2:boolean valid():26:26 -> E2
-    3:3:int getTargetBlockIndex(int):36:36 -> E2
-    3:3:boolean valid():26 -> E2
-    4:4:int getFallthroughBlockIndex():55:55 -> E2
-    4:4:boolean valid():26 -> E2
-    5:5:boolean valid():26:26 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> F2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> B2
+    1:1:int getFallthroughBlockIndex():55:55 -> C2
+    1:1:int numberOfKeys():68:68 -> D2
+    1:1:int[] targetBlockIndices():40:40 -> E2
+    1:1:int numberOfKeys():68:68 -> F2
+    1:1:boolean valid():25 -> F2
+    2:2:boolean valid():26:26 -> F2
+    3:3:int getTargetBlockIndex(int):36:36 -> F2
+    3:3:boolean valid():26 -> F2
+    4:4:int getFallthroughBlockIndex():55:55 -> F2
+    4:4:boolean valid():26 -> F2
+    5:5:boolean valid():26:26 -> F2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> G2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26666,13 +26703,13 @@
     2:2:int[] targetBlockIndices():40:40 -> d
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
-    boolean isSwitch() -> p2
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
+    boolean isSwitch() -> q2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> B2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26690,27 +26727,27 @@
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():268:268 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
-    boolean isThrow() -> q2
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():49:49 -> v2
-    int opcode() -> w2
+    boolean isThrow() -> r2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():49:49 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> A2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> r2
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
+    boolean isUnop() -> s2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26723,8 +26760,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> s2
-    int opcode() -> w2
+    boolean isUshr() -> t2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26794,8 +26831,8 @@
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
     119:119:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1191 -> a
-    120:136:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1192:1208 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1212 -> a
+    120:136:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1213:1229 -> a
     137:137:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
     137:137:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):831 -> a
     138:149:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):832:843 -> a
@@ -26872,29 +26909,31 @@
     1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):282:283 -> b
     3:6:void linkTo(com.android.tools.r8.ir.code.Value):367:370 -> b
     7:8:java.util.Set aliasedUsers():429:430 -> b
-    9:13:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> b
-    14:14:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> b
-    14:14:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> b
-    15:19:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> b
-    20:21:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
-    22:23:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
-    24:24:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
-    25:31:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
-    32:32:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
-    32:32:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    22:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1193:1205 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
     1:1:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> c
     1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):510 -> c
     2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):511:514 -> c
-    6:7:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
-    8:9:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
-    10:22:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    6:6:boolean lambda$getDynamicLowerBoundType$3(com.android.tools.r8.ir.code.Value):1206:1206 -> d
-    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1227:1227 -> d
     1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):535:536 -> e
     3:8:void clearUsers():545:550 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1194:1194 -> e
+    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
     1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
     3:8:void clearUsersInfo():595:600 -> f
     1:2:void computeNeedsRegister():726:727 -> g
@@ -27026,8 +27065,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27040,8 +27079,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    boolean isXor() -> t2
-    int opcode() -> w2
+    boolean isXor() -> u2
+    int opcode() -> x2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27271,7 +27310,7 @@
     33:33:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     34:34:void rewriteNots():234:234 -> a
     34:34:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
@@ -27501,7 +27540,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27729,7 +27768,7 @@
     4:5:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):324:325 -> <init>
     6:15:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):329:338 -> <init>
     com.android.tools.r8.ir.conversion.CfState$BaseSnapshot asBase() -> a
-    1:1:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    1:1:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     1:1:com.android.tools.r8.ir.conversion.CfState$SlotType getSlotType(com.android.tools.r8.graph.DexType):343 -> a
     2:4:com.android.tools.r8.ir.conversion.CfState$SlotType getSlotType(com.android.tools.r8.graph.DexType):343:345 -> a
     5:9:com.android.tools.r8.ir.conversion.CfState$Slot getLocal(int):371:375 -> a
@@ -27863,7 +27902,7 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
     154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
@@ -28499,7 +28538,7 @@
     203:203:void insertDebugPositions():676 -> a
     203:203:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     204:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
-    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -28510,14 +28549,14 @@
     218:219:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
     220:250:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     220:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     251:251:void joinPredecessorsWithIdenticalPhis():2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     252:252:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     252:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     253:267:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     253:267:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):498:509 -> a
+    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):499:510 -> a
     268:279:void joinPredecessorsWithIdenticalPhis():2576 -> a
     268:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     280:280:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
@@ -28530,10 +28569,10 @@
     283:327:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     283:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     328:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1015:1015 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1013:1013 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
-    346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
@@ -28639,7 +28678,7 @@
     553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
     555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
-    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28648,7 +28687,7 @@
     560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
     563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
-    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28776,119 +28815,119 @@
     966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> a
     967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
     967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987 -> a
-    968:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:989 -> a
-    970:970:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    970:970:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:988 -> a
+    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
     971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
-    972:972:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    972:972:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
-    973:976:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
-    977:977:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
-    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
-    979:979:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
-    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
-    980:981:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1969 -> a
-    982:982:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    982:982:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
-    983:983:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
-    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
-    985:985:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
-    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
-    986:987:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1645 -> a
-    988:988:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    988:988:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
-    989:992:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
-    993:995:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
-    996:996:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
-    996:996:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
-    997:1001:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
-    1002:1002:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
-    1002:1002:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
-    1003:1013:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
-    1014:1018:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
-    1019:1019:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
-    1019:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
-    1020:1020:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> 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):2157 -> a
-    1021:1022:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
-    1023:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
-    1024:1026:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
-    1024:1026:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1027:1033:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
-    1027:1033:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1034:1034:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
-    1034:1034:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1035:1060:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
-    1061:1065:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
-    1066:1072:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
-    1073:1073:boolean isOffsetProcessed(int):2353:2353 -> a
-    1073:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
-    1073:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
-    1074:1076:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
-    1074:1076:void ensureSuccessorBlock(int,int,boolean):2382 -> a
-    1077:1080:int getBlockStartOffset(int):2337:2340 -> a
-    1077:1080:void ensureSuccessorBlock(int,int,boolean):2383 -> a
-    1081:1081:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
-    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1083:1083:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2387 -> a
-    1084:1084:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1084:1084:void ensureSuccessorBlock(int,int,boolean):2389 -> a
-    1085:1085:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1085:1085:void ensureSuccessorBlock(int,int,boolean):2390 -> a
-    1086:1086:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
-    1087:1087:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
-    1087:1087:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
-    1088:1088:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
-    1088:1088:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
-    1089:1094:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
-    1095:1098:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
-    1099:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
-    1100:1102:void generateSplitEdgeBlocks():2448:2450 -> a
-    1100:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1103:1103:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
-    1103:1103:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
-    1103:1103:void generateSplitEdgeBlocks():2450 -> a
-    1103:1103:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1104:1104:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
-    1104:1104:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
-    1104:1104:void generateSplitEdgeBlocks():2450 -> a
-    1104:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1105:1105:void generateSplitEdgeBlocks():2451:2451 -> a
+    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
+    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
+    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
+    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
+    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
+    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1968 -> a
+    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
+    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
+    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
+    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
+    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1644 -> a
+    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
+    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
+    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
+    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
+    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
+    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
+    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
+    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
+    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2157 -> a
+    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
+    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
+    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
+    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
+    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
+    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
+    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
+    1070:1070:boolean isOffsetProcessed(int):2353:2353 -> a
+    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
+    1070:1070:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
+    1071:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1074:1077:int getBlockStartOffset(int):2337:2340 -> a
+    1074:1077:void ensureSuccessorBlock(int,int,boolean):2383 -> a
+    1078:1078:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
+    1079:1079:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
+    1079:1079:void ensureSuccessorBlock(int,int,boolean):2386 -> a
+    1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
+    1080:1080:void ensureSuccessorBlock(int,int,boolean):2387 -> a
+    1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
+    1081:1081:void ensureSuccessorBlock(int,int,boolean):2389 -> a
+    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
+    1082:1082:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1083:1083:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
+    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
+    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
+    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
+    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
+    1097:1099:void generateSplitEdgeBlocks():2448:2450 -> a
+    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
+    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1100:1100:void generateSplitEdgeBlocks():2450 -> a
+    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1101:1101:void generateSplitEdgeBlocks():2450 -> a
+    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1102:1102:void generateSplitEdgeBlocks():2451:2451 -> a
+    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1103:1104:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
+    1103:1104:void generateSplitEdgeBlocks():2452 -> a
+    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1105:1105:void generateSplitEdgeBlocks():2455:2455 -> a
     1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1106:1107:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1106:1107:void generateSplitEdgeBlocks():2452 -> a
-    1106:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1108:1108:void generateSplitEdgeBlocks():2455:2455 -> a
-    1108:1108:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1109:1109:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
-    1109:1109:void generateSplitEdgeBlocks():2456 -> a
-    1109:1109:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1110:1110:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1110:1110:void generateSplitEdgeBlocks():2457 -> a
-    1110:1110:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1111:1121:void generateSplitEdgeBlocks():2460:2470 -> a
-    1111:1121:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1122:1130:void generateSplitEdgeBlocks():2467:2475 -> a
-    1122:1130:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1131:1136:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
-    1131:1136:void generateSplitEdgeBlocks():2475 -> a
-    1131:1136:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1137:1147:void generateSplitEdgeBlocks():2476:2486 -> a
-    1137:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1148:1150:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1148:1150:void generateSplitEdgeBlocks():2486 -> a
-    1148:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1151:1151:void generateSplitEdgeBlocks():2486:2486 -> a
-    1151:1151:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1152:1152:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    1152:1152:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
-    1153:1153:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
-    1154:1154:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
+    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1106:1106:void generateSplitEdgeBlocks():2456 -> a
+    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1107:1107:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
+    1107:1107:void generateSplitEdgeBlocks():2457 -> a
+    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1108:1118:void generateSplitEdgeBlocks():2460:2470 -> a
+    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1119:1127:void generateSplitEdgeBlocks():2467:2475 -> a
+    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
+    1128:1133:void generateSplitEdgeBlocks():2475 -> a
+    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1134:1144:void generateSplitEdgeBlocks():2476:2486 -> a
+    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1145:1147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
+    1145:1147:void generateSplitEdgeBlocks():2486 -> a
+    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1148:1148:void generateSplitEdgeBlocks():2486:2486 -> a
+    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
+    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
+    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
     1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> b
     3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> b
     3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868 -> b
@@ -28908,43 +28947,43 @@
     33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> b
     35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
     35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):997 -> b
-    36:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:999 -> b
-    38:38:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    38:38:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
-    39:43:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
-    44:47:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
-    44:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
-    48:48:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
-    49:54:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
-    55:58:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
-    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
-    61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
-    68:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
-    72:72:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
-    72:72:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
-    73:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
-    76:76:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    76:76:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
-    77:80:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
-    81:81:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
-    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
-    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
-    83:83:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
-    83:83:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
-    84:87:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
-    88:91:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
-    88:91:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
-    92:95:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
-    92:95:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
-    92:95:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
-    96:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
+    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
+    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
+    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
+    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
+    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
+    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
+    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
+    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
+    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
+    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
+    71:71:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
+    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
+    72:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
+    75:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    75:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
+    76:79:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
+    80:80:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
+    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
+    82:82:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
+    83:86:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
+    87:90:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
+    87:90:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
+    91:94:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    95:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    98:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
     99:99:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    99:99:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    100:100:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    101:101:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
-    102:102:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
+    100:100:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
+    101:101:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
     1:2:java.util.List getArgumentValues():482:483 -> c
     3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1004 -> c
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
@@ -28954,21 +28993,21 @@
     6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> c
     7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> c
     7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007 -> c
-    8:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1009 -> c
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
-    10:10:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
-    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
-    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    12:12:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
-    13:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
-    16:16:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
-    16:16:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
-    17:19:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
-    20:37:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
-    38:38:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
-    39:39:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
-    39:39:void addGoto(int):1254 -> c
-    40:43:void addGoto(int):1255:1258 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
+    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
+    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
+    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
+    12:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
+    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
+    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
+    37:37:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
+    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
+    38:38:void addGoto(int):1254 -> c
+    39:42:void addGoto(int):1255:1258 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():478:478 -> d
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):576:576 -> d
     3:3:void resolveAndBuildNewArrayFilledData(int,int):834:834 -> d
@@ -28978,12 +29017,12 @@
     6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> d
     8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> d
     8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1017 -> d
-    9:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1019 -> d
-    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
-    11:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
-    12:17:void addMoveException(int):1602:1607 -> d
-    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
-    18:23:void addMoveException(int):1607 -> d
+    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
+    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
+    11:16:void addMoveException(int):1602:1607 -> d
+    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
+    17:22:void addMoveException(int):1607 -> d
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():487:487 -> e
     2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1164:1164 -> e
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
@@ -29029,13 +29068,13 @@
     14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214:1214 -> g
     15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> g
     15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
-    16:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1216 -> g
-    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
-    18:18:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
-    19:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
-    21:21:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
-    21:21:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
-    22:24:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
+    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1215 -> g
+    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
+    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
+    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
+    20:20:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
+    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
+    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():848:853 -> h
     7:9:void addThisArgument(int):858:860 -> h
     10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> h
@@ -29047,9 +29086,9 @@
     14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> h
     16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> h
     16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
-    17:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1226 -> h
-    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
-    19:19:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
+    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
+    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
+    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
     1:5:void addThrow(int):1844:1848 -> i
     6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
     6:6:void addThrow(int):1848 -> i
@@ -29062,54 +29101,54 @@
     11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856:1856 -> i
     12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> i
     12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856 -> i
-    13:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1858 -> i
-    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
-    15:15:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
+    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
     1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1863 -> j
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> j
     2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> j
     3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> j
     5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> j
     5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> j
-    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1868 -> j
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
-    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
-    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
-    11:11:boolean isOffsetProcessed(int):2353:2353 -> j
-    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
-    12:15:int getBlockStartOffset(int):2337:2340 -> j
-    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
-    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    20:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    32:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
+    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
+    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
+    10:10:boolean isOffsetProcessed(int):2353:2353 -> j
+    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
+    11:14:int getBlockStartOffset(int):2337:2340 -> j
+    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
+    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    19:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    27:28:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    31:32:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    38:38:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
     39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    41:42:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
+    40:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
     43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
+    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
     1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1231 -> k
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
     2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> k
@@ -29142,13 +29181,13 @@
     3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> m
     5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> m
     5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1745 -> m
-    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
-    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
-    9:10:boolean isIndexProcessed(int):2357:2358 -> m
-    11:12:void ensureSubroutineProcessedInstructions():2375:2376 -> m
-    11:12:boolean isIndexProcessed(int):2360 -> m
-    13:13:boolean isIndexProcessed(int):2361:2361 -> m
+    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1748 -> m
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
+    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
+    8:9:boolean isIndexProcessed(int):2357:2358 -> m
+    10:11:void ensureSubroutineProcessedInstructions():2375:2376 -> m
+    10:11:boolean isIndexProcessed(int):2360 -> m
+    12:12:boolean isIndexProcessed(int):2361:2361 -> m
     1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1873 -> n
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> n
     2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> n
@@ -29192,9 +29231,9 @@
     3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735:1735 -> r
     4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> r
     4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735 -> r
-    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1737 -> r
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
-    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
+    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1736 -> r
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
+    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
     1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1913 -> s
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> s
     2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> s
@@ -29282,541 +29321,553 @@
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List neverMergePrefixes -> O
-    boolean seenNotNeverMergePrefix -> P
+    java.util.List onWaveDoneActions -> O
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
     com.android.tools.r8.utils.CfgPrinter printer -> t
-    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> G
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> H
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> K
-    boolean $assertionsDisabled -> R
+    boolean seenNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
     com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> g
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> j
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> o
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> u
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> J
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> i
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> r
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> s
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> K
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> F
     com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> l
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> C
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> E
-    com.android.tools.r8.graph.DexString highestSortingString -> M
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
+    java.util.List neverMergePrefixes -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> L
+    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> H
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> I
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> L
     com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> G
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> f
-    boolean seenNeverMergePrefix -> Q
+    boolean seenNotNeverMergePrefix -> Q
+    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> I
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> p
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> A
     com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> n
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> J
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> e
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> x
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
-    java.util.List onWaveDoneActions -> N
+    com.android.tools.r8.graph.DexString highestSortingString -> N
     1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):190:190 -> <init>
-    2:163: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):173:334 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    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):191:191 -> <init>
+    2:169: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):174:341 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$21(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682:682 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):678:678 -> a
-    4:4:java.lang.String lambda$new$0(java.lang.String):210:210 -> a
-    5:8:java.util.Set getDesugaredCallSites():338:341 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):442:449 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):382:383 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):451 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):452 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453:453 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):435:436 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
-    31:34:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458:461 -> a
-    35:41:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):465:471 -> a
-    42:43:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):496:497 -> a
-    42:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    44:51:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    44:51:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498 -> a
-    44:51:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    52:52:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498:498 -> a
-    52:52:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    53:57:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):534:538 -> a
-    58:60:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):553:555 -> a
-    61:69:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):619:627 -> a
-    70:71:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):847:848 -> a
-    70:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628 -> a
-    72:72:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    72:72:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):848 -> a
-    72:72:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628 -> a
-    73:74:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):403:404 -> a
-    73:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):629 -> a
-    75:83:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):638:646 -> a
-    84:84:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
-    84:84:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    84:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    85:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    85:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    87:138:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):647:698 -> a
-    139:139:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    139:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):698 -> a
-    140:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):699:699 -> a
-    141:142:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):397:398 -> a
-    141:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):700 -> a
-    143:146:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):704:707 -> a
-    147:149:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    147:149:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    150:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):710:711 -> a
-    152:153:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
-    154:154:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:713 -> a
-    155:156:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    155:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
-    157:158:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):715 -> a
-    159:161:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:718 -> a
-    162:163: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):858:859 -> a
-    162:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
-    164:174:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:731 -> a
-    175:177:com.android.tools.r8.graph.DexType computeOutlineClassType():901:903 -> a
-    175:177:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    178:178:com.android.tools.r8.graph.DexType computeOutlineClassType():903 -> a
-    178:178:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    179:181:com.android.tools.r8.graph.DexType computeOutlineClassType():904:906 -> a
-    179:181:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    182:234:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731:783 -> a
-    235:242:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):777:784 -> a
-    243:243:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    243:243:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    244:244:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):657:657 -> a
-    245:245:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):653:653 -> a
-    246:247:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):728:729 -> a
-    248:248:void addWaveDoneAction(com.android.tools.r8.utils.Action):798:798 -> a
-    249:249:boolean isInWave():808:808 -> a
-    249:249:void addWaveDoneAction(com.android.tools.r8.utils.Action):801 -> a
-    250:250:void addWaveDoneAction(com.android.tools.r8.utils.Action):804:804 -> a
-    251:251:void addWaveDoneAction(com.android.tools.r8.utils.Action):802:802 -> a
-    252:252:void addWaveDoneAction(com.android.tools.r8.utils.Action):799:799 -> a
-    253:253:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):812:812 -> a
-    254:259:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):822:827 -> a
-    260:277:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):826:843 -> a
-    278:288:java.lang.Object lambda$forEachSelectedOutliningMethod$12(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):829:839 -> a
-    289:289:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):869:869 -> a
-    290:293:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):913:916 -> a
-    294:299:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):922:927 -> a
-    300:305:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):931:936 -> a
-    306:306:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    306:306:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937 -> a
-    307:307:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937:937 -> a
-    308:308:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):933:933 -> a
-    309:311:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):954:956 -> a
-    312:312:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):955:955 -> a
-    313:313:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    314:314:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    314:314:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962 -> a
-    315:315:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962:962 -> a
-    316:316:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    317:323:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):979:985 -> a
-    324:326:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1027:1029 -> a
-    327:332:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1028:1033 -> a
-    333:333:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    333:333:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033 -> a
-    334:334:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033:1033 -> a
-    335:348:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1032:1045 -> a
-    349:354:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1839:1844 -> a
-    349:354:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1048 -> a
-    355:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1049:1055 -> a
-    362:362:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
-    362:362:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1055 -> a
-    363:377:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1056:1070 -> a
-    378:378:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    378:378:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070 -> a
-    379:393:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1071:1085 -> a
-    394:394:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1592 -> a
-    394:394:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    395:395:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    395:395:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592 -> a
-    395:395:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    396:398:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1594 -> a
-    396:398:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    399:399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    399:399:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1594 -> a
-    399:399:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    400:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1595:1598 -> a
-    400:403:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    404:408:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1094:1098 -> a
-    409:409:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    409:409:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098 -> a
-    410:417:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1101:1108 -> a
-    418:418:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    418:418:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1109 -> a
-    419:464:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110:1155 -> a
-    465:465:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    465:465:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1155 -> a
-    466:519:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1160:1213 -> a
-    520:522:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):990:992 -> a
-    520:522:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1214 -> a
-    523:531:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1217:1225 -> a
-    532:550:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1224:1242 -> a
-    551:551:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    551:551:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1242 -> a
-    552:575:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1243:1266 -> a
-    576:594:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1258:1276 -> a
-    595:595:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    595:595:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259 -> a
-    596:661:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1279:1344 -> a
-    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    662:662:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1344 -> a
-    663:673:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1345:1355 -> a
-    674:679:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):890:895 -> a
-    674:679:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1355 -> a
-    680:703:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1356:1379 -> a
-    704:708:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
-    704:708:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    709:715:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
-    709:715:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    709:715:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    716:719:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
-    716:719:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    720:724:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1380:1384 -> a
-    725:735:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1455:1465 -> a
-    725:735:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    736:736:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    736:736:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1465 -> a
-    736:736:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    737:745:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1469:1477 -> a
-    737:745:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    746:746:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1388:1388 -> a
-    747:753:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1484:1490 -> a
-    747:753:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    754:754:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    754:754:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1485 -> a
-    754:754:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    755:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1390 -> a
-    756:762:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1547:1553 -> a
-    756:762:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1391 -> a
-    763:786:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1426:1449 -> a
-    763:786:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1392 -> a
-    787:787:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    787:787:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1551 -> a
-    787:787:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1391 -> a
-    788:788:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
-    788:788:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    789:791:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1397:1399 -> a
-    792:792:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
-    792:792:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1399 -> a
-    793:800:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400:1407 -> a
-    801:801:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    801:801:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1410 -> a
-    802:807:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1410:1415 -> a
-    808:808:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    808:808:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415 -> a
-    809:810:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415:1416 -> a
-    811:816:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415:1420 -> a
-    817:817:void lambda$rewriteCodeInternal$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1142:1142 -> a
-    818:818:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1268:1268 -> a
-    819:834:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1498:1513 -> a
-    835:844:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> a
-    835:844:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    845:845:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    845:845:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
-    845:845:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    846:849:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> a
-    846:849:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    850:850:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    850:850:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
-    850:850:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    851:859:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
-    851:859:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    860:860:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    860:860:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    861:861:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    861:861:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
-    861:861:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    862:875:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> a
-    862:875:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    876:931:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
-    876:931:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    932:932:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    932:932:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    933:934:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1516:1517 -> a
-    935:935:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
-    935:935:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1518 -> a
-    936:936:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1519:1519 -> a
-    937:937:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    937:937:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    938:941:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1525:1528 -> a
-    942:950:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1560:1568 -> a
-    942:950:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1528 -> a
-    951:956:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1536:1541 -> a
-    957:957:boolean lambda$computeMayHaveSideEffects$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1537:1537 -> a
-    958:959:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1582:1583 -> a
-    960:960:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    960:960:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1583 -> a
-    961:965:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1602:1606 -> a
-    961:965:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1584 -> a
-    966:966:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1586:1586 -> a
-    967:967:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1611:1611 -> a
-    967:967:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    968:973:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1650:1655 -> a
-    968:973:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    968:973:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    974:974:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1312:1312 -> a
-    974:974:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1655 -> a
-    974:974:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    974:974:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    975:975:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656:1656 -> a
-    975:975:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    975:975:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    976:988:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4309 -> a
-    976:988:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    976:988:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    976:988:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    989:989:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
-    989:989:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310 -> a
-    989:989:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    989:989:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    989:989:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    990:991:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310:4311 -> a
-    990:991:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    990:991:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    990:991:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    992:992:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4297 -> a
-    992:992:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    992:992:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    992:992:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    993:1002:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1658:1667 -> a
-    993:1002:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    993:1002:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1003:1003:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1666:1666 -> a
-    1003:1003:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    1003:1003:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1004:1008:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1614:1618 -> a
-    1004:1008:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1009:1009:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    1009:1009:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618 -> a
-    1009:1009:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1010:1010:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618:1618 -> a
-    1010:1010:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1011:1015:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1617:1621 -> a
-    1011:1015:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1016:1016:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724:1724 -> a
-    1017:1017:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
-    1017:1017:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724 -> a
-    1018:1029:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1727:1738 -> a
-    1030:1032:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1784:1786 -> a
-    1030:1032:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1739 -> a
-    1033:1033:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1742:1742 -> a
-    1034:1035:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1791:1792 -> a
-    1034:1035:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1743 -> a
-    1036:1037:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1796:1797 -> a
-    1036:1037:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1746 -> a
-    1038:1039:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1749:1750 -> a
-    1040:1044:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1770:1774 -> a
-    1040:1044:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1751 -> a
-    1045:1050:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1752:1757 -> a
-    1051:1051: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):1806:1806 -> a
-    1051:1051:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1052:1052:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1052:1052: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):1806 -> a
-    1052:1052:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1053:1063: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):1807:1817 -> a
-    1053:1063:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1064:1065:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1732:1733 -> a
-    1066:1066:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1731:1731 -> a
-    1067:1067:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1779:1779 -> a
-    1068:1068:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1855:1855 -> a
-    1069:1069:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    1069:1069:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1856 -> a
-    1070:1087:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1857:1874 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):477:482 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:491 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):542:551 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):561:589 -> b
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690:690 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):686:686 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
+    5:8:java.util.Set getDesugaredCallSites():345:348 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):449:456 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:390 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460:460 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):442:443 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):464 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466:469 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):473:479 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:505 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506:506 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):542:546 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):561:563 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):627:635 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):886:887 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
+    74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):887 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):410:411 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646:654 -> a
+    86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):655:706 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):404:405 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):712:715 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718:719 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:721 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:726 -> a
+    164:165:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):897:898 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):729:729 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):732:734 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:748 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():948:950 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():950 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():951:953 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748:800 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):794:801 -> a
+    256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):665:665 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):661:661 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):745:746 -> a
+    261:264:void waveStart(java.util.Collection):805:808 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):819:819 -> a
+    266:266:boolean isInWave():829:829 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):822 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):825:825 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):823:823 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):833:833 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):843:848 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):847:864 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):850:860 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):869:869 -> a
+    307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870:872 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):871:882 -> a
+    323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):916:916 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):960:963 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):969:974 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):978:983 -> a
+    341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):980:980 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1001:1003 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1002:1002 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009:1009 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1026:1032 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1076 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1080 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080:1080 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1079:1092 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1890:1895 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1095 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1096:1102 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1102 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103:1117 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1117 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1118:1132 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1643 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1645 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1645 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1646:1649 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1141:1155 -> a
+    454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1156 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1157:1202 -> a
+    501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1207:1260 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1037:1039 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1261 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1264:1272 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1271:1289 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1289 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1290:1313 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1305:1323 -> a
+    631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1306 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1326:1375 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1375 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1376:1386 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):889:894 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1386 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387:1430 -> a
+    744:748:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
+    749:755:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    756:759:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    760:764:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1431:1435 -> a
+    765:775:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1506:1516 -> a
+    765:775:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    776:776:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    776:776:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1516 -> a
+    776:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    777:785:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1520:1528 -> a
+    777:785:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    786:786:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1439:1439 -> a
+    787:793:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1535:1541 -> a
+    787:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1440 -> a
+    794:794:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    794:794:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1536 -> a
+    794:794:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1440 -> a
+    795:795:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1441:1441 -> a
+    796:802:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1598:1604 -> a
+    796:802:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1442 -> a
+    803:826:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1477:1500 -> a
+    803:826:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1443 -> a
+    827:827:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    827:827:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1602 -> a
+    827:827:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1442 -> a
+    828:828:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
+    828:828:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    829:831:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1448:1450 -> a
+    832:832:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
+    832:832:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450 -> a
+    833:840:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1451:1458 -> a
+    841:841:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    841:841:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1461 -> a
+    842:847:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1461:1466 -> a
+    848:848:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    848:848:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466 -> a
+    849:850:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466:1467 -> a
+    851:856:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466:1471 -> a
+    857:857:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1189:1189 -> a
+    858:858:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1315:1315 -> a
+    859:874:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1549:1564 -> a
+    875:884:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> a
+    875:884:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    885:885:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    885:885:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
+    885:885:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    886:889:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> a
+    886:889:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    890:890:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    890:890:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
+    890:890:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    891:899:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
+    891:899:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    900:900:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
+    900:900:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    901:901:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    901:901:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
+    901:901:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    902:915:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> a
+    902:915:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    916:971:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
+    916:971:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    972:972:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    972:972:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    973:974:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1567:1568 -> a
+    975:975:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
+    975:975:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1569 -> a
+    976:976:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    977:977:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    977:977:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    978:981:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1576:1579 -> a
+    982:990:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1611:1619 -> a
+    982:990:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1579 -> a
+    991:996:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1587:1592 -> a
+    997:997:boolean lambda$computeMayHaveSideEffects$18(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1588:1588 -> a
+    998:999:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1633:1634 -> a
+    1000:1000:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1000:1000:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1634 -> a
+    1001:1005:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1653:1657 -> a
+    1001:1005:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1635 -> a
+    1006:1006:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1637:1637 -> a
+    1007:1007:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1662:1662 -> a
+    1007:1007:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1008:1013:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1701:1706 -> a
+    1008:1013:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1008:1013:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1014:1014:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1312:1312 -> a
+    1014:1014:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1706 -> a
+    1014:1014:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1014:1014:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1015:1015:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707:1707 -> a
+    1015:1015:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1015:1015:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1016:1028:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4321 -> a
+    1016:1028:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1016:1028:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1016:1028:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1029:1029:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
+    1029:1029:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322 -> a
+    1029:1029:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1029:1029:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1029:1029:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1030:1031:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322:4323 -> a
+    1030:1031:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1030:1031:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1030:1031:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1032:1032:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4309 -> a
+    1032:1032:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1032:1032:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1032:1032:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1033:1042:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1709:1718 -> a
+    1033:1042:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1033:1042:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1043:1043:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1717:1717 -> a
+    1043:1043:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1043:1043:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1044:1048:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1665:1669 -> a
+    1044:1048:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1049:1049:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    1049:1049:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669 -> a
+    1049:1049:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1050:1050:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669:1669 -> a
+    1050:1050:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1051:1055:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1668:1672 -> a
+    1051:1055:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1056:1056:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775:1775 -> a
+    1057:1057:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
+    1057:1057:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775 -> a
+    1058:1069:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1778:1789 -> a
+    1070:1072:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1835:1837 -> a
+    1070:1072:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1790 -> a
+    1073:1073:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1793:1793 -> a
+    1074:1075:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1842:1843 -> a
+    1074:1075:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1794 -> a
+    1076:1077:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1847:1848 -> a
+    1076:1077:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    1078:1079:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1800:1801 -> a
+    1080:1084:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1821:1825 -> a
+    1080:1084:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1802 -> a
+    1085:1090:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1803:1808 -> a
+    1091:1091: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):1857:1857 -> a
+    1091:1091:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1092:1092:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1092:1092: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):1857 -> a
+    1092:1092:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1093:1103: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):1858:1868 -> a
+    1093:1103:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1104:1105:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1783:1784 -> a
+    1106:1106:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1782:1782 -> a
+    1107:1107:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1830:1830 -> a
+    1108:1108:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1906:1906 -> a
+    1109:1109:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    1109:1109:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1907 -> a
+    1110:1127:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1908:1925 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):485:490 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):488:499 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):550:559 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):569:597 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589:593 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593:599 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597:601 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601:607 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:604 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:601 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
-    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):602:602 -> b
-    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):737:739 -> b
-    86:86:boolean isInWave():808:808 -> b
-    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):945:947 -> b
-    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1003:1011 -> b
-    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1009:1009 -> b
-    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1627:1632 -> b
-    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1630:1634 -> b
-    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673:1673 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:609 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
+    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> b
+    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):754:756 -> b
+    86:86:boolean isInWave():829:829 -> b
+    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):992:994 -> b
+    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1050:1058 -> b
+    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1056:1056 -> b
+    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1678:1683 -> b
+    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681:1685 -> b
+    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724:1724 -> b
     112:112:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1300:1300 -> b
-    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673 -> b
-    113:117:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1677:1681 -> b
+    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724 -> b
+    113:117:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1728:1732 -> b
     118:118:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
-    118:118:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1682 -> b
-    119:130:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1682:1693 -> b
-    131:131:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1823:1823 -> b
-    131:131:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    118:118:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1733 -> b
+    119:130:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1733:1744 -> b
+    131:131:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1874:1874 -> b
+    131:131:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     132:132:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
-    132:132:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1823 -> b
-    132:132:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    133:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1824:1826 -> b
-    133:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1826 -> b
-    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1827:1829 -> b
-    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    132:132:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1874 -> b
+    132:132:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    133:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1875:1877 -> b
+    133:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
+    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1877 -> b
+    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1878:1880 -> b
+    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     140:140:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
-    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1830 -> b
-    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1832:1834 -> b
-    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1881 -> b
+    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1883:1885 -> b
+    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
-    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1835 -> b
-    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    145:149:boolean lambda$workaroundForwardingInitializerBug$17(com.android.tools.r8.ir.code.Instruction):1695:1699 -> b
-    150:151:void printPhase(java.lang.String):1849:1850 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:523 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):522:528 -> c
+    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1886 -> b
+    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    145:149:boolean lambda$workaroundForwardingInitializerBug$19(com.android.tools.r8.ir.code.Instruction):1746:1750 -> b
+    150:151:void printPhase(java.lang.String):1900:1901 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512:531 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):530:536 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528:528 -> c
-    43:43:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):813:813 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536:536 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):834:834 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):814 -> c
-    45:45:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):814:814 -> c
-    46:46:void lambda$computeReachabilitySensitivity$10(com.android.tools.r8.graph.DexEncodedMethod):814:814 -> c
-    47:47:void clearDexMethodCompilationState():865:865 -> c
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):835 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):835:835 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):835:835 -> c
+    47:47:void clearDexMethodCompilationState():912:912 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():364:370 -> d
-    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):536:536 -> d
-    1:1:boolean enableTwrCloseResourceDesugaring():360:360 -> e
-    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):481:481 -> e
-    3:7:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1638:1642 -> e
-    1:2:boolean removeLambdaDeserializationMethods():374:375 -> f
-    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):520:520 -> f
-    1:3:void waveDone():792:794 -> g
-    1:1:void waveStart():788:788 -> h
+    1:7:boolean enableTryWithResourcesDesugaring():371:377 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):544:544 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():367:367 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):489:489 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):874:878 -> e
+    1:2:boolean removeLambdaDeserializationMethods():381:382 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):528:528 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):808:808 -> f
+    1:3:void waveDone():813:815 -> g
+    4:8:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1689:1693 -> g
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():76:76 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):83:83 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):80:85 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):76:76 -> a
-    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):76:76 -> a
-    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):89:93 -> a
-    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):100:110 -> a
-    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):479:499 -> a
-    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):112 -> a
-    40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
+    1:1:void <clinit>():75:75 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):82:82 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):79:84 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):75:75 -> a
+    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):75:75 -> a
+    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):88:92 -> a
+    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):99:109 -> a
+    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
+    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
+    40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    43:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):118:131 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):506:510 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):535:537 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):510 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:527 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    82:98:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:149 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    99:99:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):149 -> a
-    100:103:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150:153 -> a
-    104:144:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):152:192 -> a
-    145:178:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):434:467 -> a
-    145:178:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    179:179:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):458:458 -> a
-    179:179:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    180:180:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):457:457 -> a
-    180:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    181:188:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):194:201 -> a
-    189:220:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):616:647 -> a
-    189:220:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    221:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):203:220 -> a
-    239:255:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):219:235 -> a
-    256:265:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):230:239 -> a
-    266:266:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    266:266:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    267:273:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239:245 -> a
-    274:274:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    274:274:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):246 -> a
-    275:275:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):246:246 -> a
-    276:282:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):245:251 -> a
-    283:283:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    283:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):252 -> a
-    284:284:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):253:253 -> a
-    285:285:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    285:285:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):254 -> a
-    286:286:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
-    287:287: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
-    287:287:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):259 -> a
-    288:300:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):260:272 -> a
-    301:301:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    301:301:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):272 -> a
-    302:302:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    302:302:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):274 -> a
-    303:322:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):278:297 -> a
-    323:332:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):296:305 -> a
-    333:348:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):304:319 -> a
-    349:365:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):318:334 -> a
-    366:388:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):333:355 -> a
-    389:399:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):354:364 -> a
-    400:406:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):363:369 -> a
-    407:413:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
-    414:420:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:379 -> a
-    421:428:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):378:385 -> a
-    429:435:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):384:390 -> a
-    436:465:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):389:418 -> a
-    466:466:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    466:466:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418 -> a
-    467:471:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418:422 -> a
-    472:478:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):177:183 -> a
-    479:479: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
-    479:479:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):183 -> a
-    480:480:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    480:480:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):542 -> a
-    481:527:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):543:589 -> a
-    528:528:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
-    529:529:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
-    530:530:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):374:374 -> a
-    531:531:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
-    532:532:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
-    533:533:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):396:396 -> a
-    534:539:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):596:601 -> a
-    540:540:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):651:651 -> a
-    541:558:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):655:672 -> 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):391:391 -> b
+    42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
+    43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
+    60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
+    64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
+    105:138:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):439:472 -> a
+    105:138:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    139:139:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):463:463 -> a
+    139:139:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    140:140:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):462:462 -> a
+    140:140:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    141:148:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):177:184 -> a
+    149:180:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):621:652 -> a
+    149:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    181:198:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):186:203 -> a
+    199:215:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):202:218 -> a
+    216:225:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):213:222 -> a
+    226:226:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    226:226:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222 -> a
+    227:237:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222:232 -> a
+    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    238:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):233 -> a
+    239:239:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):234:234 -> a
+    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    240:240:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):235 -> a
+    241:244:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):236:239 -> a
+    245:245:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    245:245:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):240 -> a
+    246:246:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):240:240 -> a
+    247:247:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239:239 -> a
+    248:248:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    248:248:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):243 -> a
+    249:261:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):244:256 -> a
+    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    262:262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):256 -> a
+    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    263:263:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):258 -> a
+    264:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):262:281 -> a
+    284:293:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):280:289 -> a
+    294:309:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):288:303 -> a
+    310:326:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):302:318 -> a
+    327:349:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):317:339 -> a
+    350:360:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):338:348 -> a
+    361:367:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):347:353 -> a
+    368:374:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):352:358 -> a
+    375:381:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):357:363 -> a
+    382:389:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):362:369 -> a
+    390:396:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
+    397:429:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:405 -> a
+    430:436:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):160:166 -> a
+    437:437: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
+    437:437:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):166 -> a
+    438:438:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    438:438:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):547 -> a
+    439:485:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):548:594 -> a
+    486:486:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):348:348 -> a
+    487:487:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):353:353 -> a
+    488:488:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):358:358 -> a
+    489:489:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
+    490:490:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
+    491:491:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
+    492:495:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):409:412 -> a
+    496:505:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):411:420 -> a
+    506:510:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:515 -> a
+    506:510:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    511:513:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):540:542 -> a
+    511:513:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):515 -> a
+    511:513:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    514:530:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):516:532 -> a
+    514:530:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    531:534:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):421:424 -> a
+    535:540:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):601:606 -> a
+    541:541:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):656:656 -> a
+    542:559:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):660:677 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.Z:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
@@ -29824,10 +29875,10 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):683:687 -> <init>
-    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):692:705 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):702:702 -> a
+    1:1:void <clinit>():680:680 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):688:692 -> <init>
+    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
 com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.b0:
     java.util.Deque waves -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
@@ -29839,8 +29890,8 @@
     26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
     31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
     32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
-    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
-    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
     60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
 com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.c0:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
@@ -29983,7 +30034,7 @@
     117:117: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
     118:131: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():1390:1392 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1425:1427 -> 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
@@ -30009,10 +30060,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> 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):961:961 -> 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):959:959 -> 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
@@ -30151,7 +30202,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:70 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:1:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     3:10:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
     11:29:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
@@ -30187,13 +30238,13 @@
     1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1296 -> a
     3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1295 -> a
     4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314 -> a
     15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314:1314 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
     17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
     18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -30244,12 +30295,12 @@
     340:340:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1031:1031 -> b
     1:3:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:76 -> c
     1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     4:4:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):76 -> c
     4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     5:7:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:79 -> c
     5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
     8:8:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77 -> c
     8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     9:34:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):85:110 -> c
@@ -30264,23 +30315,23 @@
     99:123:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1004:1028 -> e
     124:148:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1025:1049 -> e
     149:157:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1046:1054 -> e
-    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
     158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
     159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
-    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
     166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
     167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
     1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
     14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
     30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
     32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
     34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
@@ -30312,18 +30363,18 @@
     32:45:void process(com.android.tools.r8.graph.DexClass):73:86 -> a
     46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):144:191 -> a
     46:93:void process(com.android.tools.r8.graph.DexClass):96 -> a
-    94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> a
+    94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
     94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     94:94:void process(com.android.tools.r8.graph.DexClass):96 -> a
     95:95:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
+    95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
     95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     95:95:void process(com.android.tools.r8.graph.DexClass):96 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
+    96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
     96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     96:96:void process(com.android.tools.r8.graph.DexClass):96 -> a
-    97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
+    97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
     97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     97:97:void process(com.android.tools.r8.graph.DexClass):96 -> a
     98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):194:205 -> a
@@ -30462,58 +30513,92 @@
 com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.D.d.q:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):51:53 -> <init>
-    1:5:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):95:99 -> a
-    6:6:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):113:113 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    7:7:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114 -> a
-    8:8:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114:114 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    9:9:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114 -> a
-    10:10:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):115:115 -> a
-    11:26:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):121:136 -> a
-    27:28: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):222:223 -> a
-    27:28:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    29:29: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):239:239 -> a
-    29:29: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):223 -> a
-    29:29:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    30:30:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    30:30: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):239 -> a
-    30:30: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):223 -> a
-    30:30:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    31:31:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    31:31: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):239 -> a
-    31:31: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):223 -> a
-    31:31:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    32:34: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):224:226 -> a
-    32:34:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    35:62:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):143:170 -> a
-    63:66: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):213:216 -> a
-    63:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    67:67: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):239:239 -> a
-    67:67: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):216 -> a
-    67:67:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    68:68:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    68:68: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):239 -> a
-    68:68: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):216 -> a
-    68:68:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    69:69: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):239 -> a
-    69:69: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):216 -> a
-    69:69:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    70:70: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):217:217 -> 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):172 -> a
-    71:93:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):171:193 -> a
-    94:94: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
-    94:94:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):189 -> a
-    95:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):197:207 -> a
-    106:109:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:235 -> a
-    110:110:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):234:234 -> a
-    111:111:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):61 -> a
-    112:137:void desugar(com.android.tools.r8.ir.code.IRCode):62:87 -> a
+    java.util.Map callBackMethods -> d
+    com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):64:64 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):62:67 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):72:72 -> a
+    2:13:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):111:122 -> a
+    2:13:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    14:33:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):132:151 -> a
+    14:33:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):125 -> a
+    14:33:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    34:34:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):126:126 -> a
+    34:34:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    35:35:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    35:35:void desugar(com.android.tools.r8.ir.code.IRCode):78 -> a
+    36:54:void desugar(com.android.tools.r8.ir.code.IRCode):79:97 -> a
+    55:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):235:246 -> a
+    55:66:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    67:68: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):326:327 -> a
+    67:68:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    67:68:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    69:69: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):350:350 -> a
+    69:69: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):327 -> a
+    69:69:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    69:69:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    70:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    70:70: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):350 -> a
+    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):327 -> 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):249 -> a
+    70:70:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> 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):959:959 -> 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):350 -> 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):327 -> 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):249 -> a
+    71:71:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    72:74:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):328:330 -> a
+    72:74:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    72:74:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    75:98:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):252:275 -> a
+    75:98:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    99:102: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):317:320 -> a
+    99:102:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    99:102:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    103:103: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):350:350 -> a
+    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):320 -> 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):277 -> a
+    103:103:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    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):350 -> 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):320 -> 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):277 -> a
+    104:104:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    105:105: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):350 -> a
+    105:105: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):320 -> a
+    105:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    105:105:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    106:106: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):321:321 -> a
+    106:106:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    106:106:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    107:128:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):276:297 -> a
+    107:128:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    129:129: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
+    129:129:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):293 -> a
+    129:129:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    130:130:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():16:16 -> a
+    130:130:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):301 -> a
+    130:130:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    131:140:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):302:311 -> a
+    131:140:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    141:143:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:175 -> a
+    144:158:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):179:193 -> a
+    159:164:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):199:204 -> a
+    165:169:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):209:213 -> a
+    170:180:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):336:346 -> a
+    181:181:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):345:345 -> a
+    182:183:boolean canConvert(com.android.tools.r8.graph.DexType):354:355 -> a
+    1:10:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):160:169 -> b
+    11:11:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):227:227 -> b
+    12:12:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> b
+    12:12:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228 -> b
+    13:13:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228:228 -> b
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    14:14:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228 -> b
+    15:15:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):229:229 -> b
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30524,7 +30609,7 @@
     java.util.Map customConversions -> f
     1:9:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List):59:67 -> <init>
     1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):71:71 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):72 -> a
     3:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):73:73 -> a
     4:4:java.util.Map getBackportCoreLibraryMember():97:97 -> a
@@ -30554,12 +30639,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30567,34 +30652,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30647,7 +30732,91 @@
     88:88:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48:48 -> a
     89:91:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     89:91:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48 -> a
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.v:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.D.d.u:
+    java.util.Map typeWrappers -> b
+    java.util.Map vivifiedTypeWrappers -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexItemFactory factory -> f
+    java.util.Set invalidWrappers -> d
+    java.util.Set generatedWrappers -> e
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> g
+    1:1:void <clinit>():95:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):115:115 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):101:118 -> <init>
+    1:5:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):130:134 -> a
+    6:6:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159:159 -> a
+    7:7:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    7:7:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159 -> a
+    8:36:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159:187 -> a
+    37:38:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):178:179 -> a
+    39:41:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    39:41:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):181 -> a
+    42:42:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):189:189 -> a
+    43:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):165:166 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):168 -> a
+    46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):168:168 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    47:47:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):167 -> a
+    48:49:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):169:170 -> a
+    50:50:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193:193 -> a
+    51:55:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> a
+    51:55:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    56:59:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:198 -> a
+    60:96:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):293:329 -> a
+    60:96:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    97:102:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> a
+    97:102:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):331 -> a
+    97:102:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    103:103:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:195 -> a
+    104:121:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):219:236 -> a
+    122:125:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):430:433 -> a
+    122:125:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    126:134:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):431:439 -> a
+    126:134:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    135:140:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    135:140:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):435 -> a
+    135:140:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    141:145:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240:244 -> a
+    146:146:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):346:346 -> a
+    147:147:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):346:346 -> a
+    148:157:void reportFinalMethodsInWrapper(java.util.Set):346:355 -> a
+    158:158:void reportFinalMethodsInWrapper(java.util.Set):350:350 -> a
+    159:167:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):361:369 -> a
+    168:206:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):374:412 -> a
+    207:209:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):461:463 -> a
+    210:210:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478:478 -> a
+    211:215:boolean verifyAllClassesGenerated():489:493 -> a
+    211:215:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478 -> a
+    216:219:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):479:482 -> a
+    220:221:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):500:501 -> a
+    220:221:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):483 -> a
+    222:222:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):484:484 -> a
+    223:231:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):505:513 -> a
+    232:232:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):508:508 -> a
+    233:233:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):507:507 -> a
+    234:236:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):533:535 -> a
+    237:261:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):534:558 -> a
+    262:267:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    262:267:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):560 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:4:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):204:206 -> b
+    5:9:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> b
+    5:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206 -> b
+    10:10:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210:210 -> b
+    11:48:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):249:286 -> b
+    11:48:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    49:54:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> b
+    49:54:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):288 -> b
+    49:54:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    55:55:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207:207 -> b
+    56:63:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:524 -> b
+    64:64:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> b
+    65:65:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):518:518 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):142:142 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):122:122 -> d
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.w:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -30662,399 +30831,391 @@
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):133:133 -> <init>
     2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):102:139 -> <init>
-    1:10:void initializeEmulatedInterfaceVariables():147:156 -> a
-    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
-    12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164 -> a
-    13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164:166 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
-    17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:170 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):169 -> a
-    26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):167:167 -> a
-    27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):181:190 -> a
+    1:10:void initializeEmulatedInterfaceVariables():143:152 -> a
+    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:159 -> a
+    12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
+    13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
+    17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
+    26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
+    27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
     37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):191 -> a
-    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):193:236 -> a
-    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
-    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):237 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):238:238 -> a
-    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236:244 -> a
-    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> a
-    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:246 -> a
-    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244:275 -> a
-    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:276 -> a
-    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279:280 -> a
-    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:294 -> a
-    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293 -> a
-    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:295 -> a
-    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):297:297 -> a
-    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:333 -> a
-    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:335 -> a
-    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:342 -> a
-    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> a
-    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> a
-    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):344:344 -> a
-    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):342:342 -> a
-    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):316:318 -> a
+    37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):187 -> a
+    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318 -> a
-    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318:366 -> a
-    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366 -> a
-    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:378 -> a
-    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):240:240 -> a
-    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):390:391 -> a
-    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):541:542 -> a
-    287:288:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
-    289:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
-    291:293:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    291:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    294:294:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    294:294:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    295:296:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):396:397 -> a
-    297:297:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):393:393 -> a
-    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468:472 -> a
-    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):476:507 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
+    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    287:288:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):387 -> a
+    289:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:389 -> a
+    291:293:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    291:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    294:294:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    294:294:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    295:296:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
+    297:297:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):389:389 -> a
+    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
+    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
     335:335:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
+    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
     336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
-    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507:521 -> a
+    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
     352:352:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
+    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
     353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
-    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521:521 -> a
-    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):528:528 -> a
-    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):591:609 -> a
-    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):759:768 -> a
-    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):780:781 -> a
-    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):775:775 -> a
-    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):782 -> a
-    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):783 -> a
-    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792:796 -> a
-    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):796 -> a
-    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):841:850 -> a
-    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):847:847 -> a
-    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):930:932 -> a
-    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968:968 -> a
-    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968 -> a
-    414:417:java.util.Map processEmulatedInterfaceHierarchy():579:582 -> a
-    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560 -> a
-    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):561:568 -> a
-    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:640 -> a
-    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
+    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
+    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
+    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
+    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
+    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
+    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
+    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641 -> a
-    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    428:428:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641:641 -> a
-    428:428:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    428:428:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    429:429:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> a
-    429:429:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642 -> a
-    429:429:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    429:429:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    430:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:645 -> a
-    430:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    430:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):644:650 -> a
-    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652 -> a
-    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652:652 -> a
-    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651:670 -> a
-    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):616:624 -> a
-    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670 -> a
-    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:675 -> a
-    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    476:478:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676:676 -> a
-    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):674:674 -> a
-    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:671 -> a
-    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:690 -> a
-    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694 -> a
-    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694:694 -> a
-    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    492:494:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695:695 -> a
-    495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):693:693 -> a
-    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:701 -> a
-    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    500:502:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    500:502:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703:703 -> a
-    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):702:702 -> a
-    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:742 -> a
-    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570 -> a
-    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570:571 -> a
-    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    500:502:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    500:502:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     551:551:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    551:551:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641 -> a
-    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    552:560:void duplicateEmulatedInterfaces():940:948 -> a
-    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    552:560:void duplicateEmulatedInterfaces():936:944 -> a
+    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     561:561:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    561:561:void duplicateEmulatedInterfaces():950 -> a
-    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    562:562:void duplicateEmulatedInterfaces():950:950 -> a
-    562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    563:565:void duplicateEmulatedInterfaces():949:951 -> a
-    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    561:561:void duplicateEmulatedInterfaces():946 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    562:562:void duplicateEmulatedInterfaces():946:946 -> a
+    562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    563:565:void duplicateEmulatedInterfaces():945:947 -> a
+    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     566:566:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    566:566:void duplicateEmulatedInterfaces():951 -> a
-    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    567:568:void duplicateEmulatedInterfaces():951:952 -> a
-    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    566:566:void duplicateEmulatedInterfaces():947 -> a
+    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    567:568:void duplicateEmulatedInterfaces():947:948 -> a
+    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     569:569:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    569:569:void duplicateEmulatedInterfaces():952 -> a
-    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    570:572:void duplicateEmulatedInterfaces():952:954 -> a
-    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:975 -> a
-    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1030:1031 -> a
-    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1032 -> a
-    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1033:1036 -> a
-    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:981 -> a
-    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1015 -> a
-    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1016 -> a
-    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1017:1026 -> a
-    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986:990 -> a
-    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990 -> a
-    616:617:void renameEmulatedInterfaces():885:886 -> a
-    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):898:906 -> a
-    618:626:void renameEmulatedInterfaces():887 -> a
-    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):917:918 -> a
-    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    627:628:void renameEmulatedInterfaces():887 -> a
-    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):919 -> a
-    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    629:629:void renameEmulatedInterfaces():887 -> a
-    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):919:920 -> a
-    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    630:631:void renameEmulatedInterfaces():887 -> a
-    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):920 -> a
-    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    632:632:void renameEmulatedInterfaces():887 -> a
-    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):908:910 -> a
-    633:635:void renameEmulatedInterfaces():887 -> a
-    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    636:638:void renameEmulatedInterfaces():888:890 -> a
-    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    639:639:void renameEmulatedInterfaces():890 -> a
-    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    640:640:void renameEmulatedInterfaces():890:890 -> a
-    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):924:926 -> a
-    641:643:void renameEmulatedInterfaces():891 -> a
-    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):994:994 -> a
-    645:647:void clear():1001:1003 -> a
-    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1040:1054 -> a
-    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1047:1047 -> a
-    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071:1071 -> a
-    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
-    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071 -> a
-    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1074:1077 -> a
-    670:670:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093:1093 -> a
-    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1107 -> a
-    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1063:1064 -> a
-    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109 -> a
-    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110:1129 -> a
-    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> a
-    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    569:569:void duplicateEmulatedInterfaces():948 -> a
+    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    570:572:void duplicateEmulatedInterfaces():948:950 -> a
+    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    616:617:void renameEmulatedInterfaces():881:882 -> a
+    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    618:626:void renameEmulatedInterfaces():883 -> a
+    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    627:628:void renameEmulatedInterfaces():883 -> a
+    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    629:629:void renameEmulatedInterfaces():883 -> a
+    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    630:631:void renameEmulatedInterfaces():883 -> a
+    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    632:632:void renameEmulatedInterfaces():883 -> a
+    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
+    633:635:void renameEmulatedInterfaces():883 -> a
+    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    636:638:void renameEmulatedInterfaces():884:886 -> a
+    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    639:639:void renameEmulatedInterfaces():886 -> a
+    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    640:640:void renameEmulatedInterfaces():886:886 -> a
+    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    641:643:void renameEmulatedInterfaces():887 -> a
+    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    645:647:void clear():997:999 -> a
+    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    670:670:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1089:1089 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1105 -> a
+    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
-    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     697:697:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
-    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
-    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1149 -> a
-    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    716:716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098:1098 -> a
-    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1115 -> a
-    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129:1145 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    716:716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1094:1094 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109:1111 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     720:720:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115 -> a
-    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115:1115 -> a
-    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    1:1:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
-    2:2:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):175:175 -> b
-    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:532 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
-    4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532 -> b
-    5:9:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:536 -> b
-    10:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):752:753 -> b
-    12:12:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):746:746 -> b
-    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):754 -> b
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
-    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):755 -> b
-    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> b
-    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:811 -> c
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
-    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:814 -> c
-    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:813 -> c
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
-    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):815 -> c
-    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> c
-    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> c
-    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    12:12:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):835:835 -> c
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> d
-    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1082 -> d
-    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):806:806 -> d
-    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1083 -> d
-    5:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1085:1086 -> d
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1111 -> a
+    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
+    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
+    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> c
+    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):809:809 -> c
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
+    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
+    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> c
+    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    12:12:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):831:831 -> c
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> d
+    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1077:1078 -> d
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):802:802 -> d
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079 -> d
+    5:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1082 -> d
     7:7:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> d
-    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1086 -> d
-    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):402:404 -> e
-    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):420:462 -> e
-    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):412:412 -> e
-    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):550:555 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.D.d.u:
+    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1082 -> d
+    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):398:400 -> e
+    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):416:458 -> e
+    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):408:408 -> e
+    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):546:551 -> e
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.D.d.v:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:5:void <clinit>():126:130 -> <clinit>
     1:1:void <init>(java.lang.String,int):122:122 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.D.d.w:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.D.d.x:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -31098,15 +31259,15 @@
     147:147:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):330:330 -> a
     147:147:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):120 -> a
     148:166:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):155:173 -> a
-    167:167:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
+    167:167:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     167:167:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):173 -> a
     168:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):174:194 -> a
     189:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):198:222 -> a
-    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
+    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
     214:214:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):222 -> a
     215:229:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:238 -> a
     230:282:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):215:267 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.D.d.x:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.D.d.y:
     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
@@ -31118,7 +31279,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.D.d.E:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.D.d.F:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexField lambdaField -> g
@@ -31136,7 +31297,7 @@
     2:40:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):65:103 -> <init>
     41:47:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     22:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31192,7 +31353,7 @@
     52:52:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean) -> e
     52:52:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> e
     53:60:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():172:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.D.d.y:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.D.d.z:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():665:665 -> <clinit>
@@ -31203,27 +31364,27 @@
     3:26:boolean ensureAccessibility():675:698 -> a
     27:27:boolean ensureAccessibility():696:696 -> a
     28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):691:691 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.D.d.z:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.D.d.A:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):624:625 -> <init>
     1:24:boolean ensureAccessibility():632:655 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.D.d.A:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.D.d.B:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():574:574 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):576:577 -> <init>
     1:27:boolean ensureAccessibility():584:610 -> a
     28:35:boolean ensureAccessibility():609:616 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.D.d.B:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.D.d.C:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):543:543 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.D.d.C:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.D.d.D:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():553:553 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):555:556 -> <init>
     1:5:boolean ensureAccessibility():562:566 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.D.d.D:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.D.d.E:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -31232,7 +31393,7 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):494:498 -> <init>
     boolean ensureAccessibility() -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):505:505 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.D.d.F:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.D.d.G:
     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>
@@ -31241,7 +31402,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.D.d.G:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.D.d.H:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
@@ -31251,13 +31412,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.D.d.H:
+com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.D.d.I:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
     1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):37:37 -> a
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> c
     1:21:void prepareInstructions():24:44 -> h
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.D.d.I:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.D.d.J:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -31304,7 +31465,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.D.d.J:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.D.d.K:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):28:28 -> <init>
@@ -31313,7 +31474,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):426:426 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> 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
@@ -31323,12 +31484,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31340,7 +31501,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):426:426 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31386,7 +31547,7 @@
     80:81:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
     80:81:void prepareInstructions():222 -> h
     82:112:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.D.d.K:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.D.d.M:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -31399,113 +31560,123 @@
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):91:91 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):73:102 -> <init>
-    1:7:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):111:117 -> a
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    8:8:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
-    9:18:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:128 -> a
-    19:30: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):335:346 -> a
-    19:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    31:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    31:31: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 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    32:32: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):345 -> a
-    32:32:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    33:66: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):348:381 -> a
-    33:66:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    67:67:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    67:67: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):381 -> a
-    67:67:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    68:68:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    68:68: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):383 -> a
-    68:68:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    69:72: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):384:387 -> a
-    69:72:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    73:73:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    73:73: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):393 -> a
-    73:73:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    74:88: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):394:408 -> a
-    74:88:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    89:90:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    89: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):410 -> a
-    89:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    91:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):410:411 -> a
-    91:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    93:94:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:138 -> a
-    95:95:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    95:95:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    96:98:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    99:106:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):148:155 -> a
-    107:117:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):423:433 -> a
-    107:117:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    118:118:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    118:118:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):433 -> a
-    118:118:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    119:119:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    119:119:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):432 -> a
-    119:119:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    120:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):438:455 -> a
-    120:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    138:139:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    138:139:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457 -> a
-    138:139:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    140:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457:458 -> a
-    140:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    142:144:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):163:165 -> a
-    145:145:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):164:164 -> a
-    146:154:boolean removeLambdaDeserializationMethods(java.lang.Iterable):173:181 -> a
-    155:155:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    155:155:boolean removeLambdaDeserializationMethods(java.lang.Iterable):181 -> a
-    156:158:boolean removeLambdaDeserializationMethods(java.lang.Iterable):182:184 -> a
-    159:165:void adjustAccessibility():200:206 -> a
-    166:166:void adjustAccessibility():205:205 -> a
-    167:168:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):215:216 -> a
-    169:178:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):222:231 -> a
-    179:179:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228:228 -> a
-    180:184:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):250:254 -> a
-    185:185:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):253:253 -> a
-    186:195:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):264:273 -> a
-    196:196:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    196:196:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
-    197:204:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):274:281 -> a
-    205:205:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    205:205:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296 -> a
-    205:205:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    206:206:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    206:206:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297 -> a
-    206:206:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    207:207:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):298:298 -> a
-    207:207:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    208:208:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    208:208:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):299 -> a
-    208:208:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    209:215:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300:306 -> a
-    209:215:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    216:216:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):305:305 -> a
-    216:216:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    217:217:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):304 -> a
-    217:217:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    218:218:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
-    218:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    219:219:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):288:288 -> a
-    220:220:boolean isInMainDexList(com.android.tools.r8.graph.DexType):258:258 -> a
-    220:220:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):289 -> a
-    221:221:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):290:290 -> a
-    222:224:java.lang.Object getKnown(java.util.Map,java.lang.Object):310:312 -> a
-    225:232:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):316:323 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):88:88 -> b
-    2:4:java.util.Set getDesugaredCallSites():236:238 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.D.d.L:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):94:94 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):76:105 -> <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):56:56 -> 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):56:56 -> a
+    3:18:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):110:125 -> a
+    19:19:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):123:123 -> a
+    20:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:150 -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
+    28:37:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:161 -> a
+    38: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):368:379 -> a
+    38:49:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    50:50:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    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):379 -> a
+    50:50:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> 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):959:959 -> 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):378 -> a
+    51:51:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    52:85: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):381:414 -> a
+    52:85:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    86:86:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    86:86: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):414 -> a
+    86:86:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    87:87:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    87:87: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):416 -> a
+    87:87:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    88:91:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):417:420 -> a
+    88:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    92:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):426 -> a
+    92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    93: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):427:441 -> a
+    93:107:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    108:109:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    108:109: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):443 -> a
+    108:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    110:111: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):443:444 -> a
+    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170:171 -> a
+    114:114:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    114:114:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171 -> a
+    115:117:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171:173 -> a
+    118:125:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):181:188 -> a
+    126:136:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):456:466 -> a
+    126:136:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    137:137:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    137:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):466 -> a
+    137:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    138:138:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465 -> a
+    138:138:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    139:156:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):471:488 -> a
+    139:156:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    157:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    157:158:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490 -> a
+    157:158:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    159:160:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490:491 -> a
+    159:160:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    161:163:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):196:198 -> a
+    164:164:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):197:197 -> a
+    165:173:boolean removeLambdaDeserializationMethods(java.lang.Iterable):206:214 -> a
+    174:174:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    174:174:boolean removeLambdaDeserializationMethods(java.lang.Iterable):214 -> a
+    175:177:boolean removeLambdaDeserializationMethods(java.lang.Iterable):215:217 -> a
+    178:184:void adjustAccessibility():233:239 -> a
+    185:185:void adjustAccessibility():238:238 -> a
+    186:187:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):248:249 -> a
+    188:197:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):255:264 -> a
+    198:198:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):261:261 -> a
+    199:203:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):283:287 -> a
+    204:204:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):286:286 -> a
+    205:214:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):297:306 -> a
+    215:215:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    215:215:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    216:223:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):307:314 -> a
+    224:224:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    224:224:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):329 -> a
+    224:224:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    225:225:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    225:225:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):330 -> a
+    225:225:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    226:226:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):331:331 -> a
+    226:226:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    227:227:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    227:227:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332 -> a
+    227:227:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    228:234:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):333:339 -> a
+    228:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    235:235:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:338 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    236:236:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    236:236:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):337 -> a
+    236:236:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    237:237:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):335:335 -> a
+    237:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321:321 -> a
+    239:239:boolean isInMainDexList(com.android.tools.r8.graph.DexType):291:291 -> a
+    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):322 -> a
+    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):323:323 -> a
+    241:243:java.lang.Object getKnown(java.util.Map,java.lang.Object):343:345 -> a
+    244:251:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):349:356 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
+    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
+    com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> c
+    com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> e
+    com.android.tools.r8.graph.DexEncodedMethod val$method -> d
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod):125:125 -> <init>
+    1:4:void registerCallSite(com.android.tools.r8.graph.DexCallSite):129:132 -> a
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.D.d.N:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> b
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.D.d.O:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.D.d.Q:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -31538,33 +31709,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1262 -> a
+    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1277 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1264 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> b
@@ -31585,7 +31756,7 @@
     12:12:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
     13:15:void processNest(java.util.List):136:138 -> d
     13:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.D.d.M:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.D.d.O:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
@@ -31604,7 +31775,7 @@
     2:2:boolean isGet():454:454 -> g
     2:2:boolean isStaticGet():470 -> g
     1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.D.d.N:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.D.d.P:
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass currentClass -> c
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> e
@@ -31634,7 +31805,7 @@
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> d
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):365:365 -> e
     1:1:void setContext(com.android.tools.r8.graph.DexMethod):335:335 -> f
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.D.d.P:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.D.d.S:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexType nestConstructorType -> k
     java.util.Map putFieldMap -> m
@@ -31651,66 +31822,67 @@
     boolean isLegitimateToHaveEmptyMappings() -> e
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> f
     1:6:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):92:97 -> g
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.D.d.T:
-    1:1:void <init>():18:18 -> <init>
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.D.d.V:
+    1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.D.d.Q:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.D.d.T:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> e
     java.util.Set notRewritten -> a
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):41:41 -> <init>
-    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):36:48 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):54:54 -> <init>
+    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):49:61 -> <init>
     boolean isRewriting() -> a
-    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):52:52 -> a
-    2:25:void validatePrefixes(java.util.Map):56:79 -> a
+    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):65:65 -> a
+    2:25:void validatePrefixes(java.util.Map):69:92 -> a
     26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    26:26:void validatePrefixes(java.util.Map):79 -> a
+    26:26:void validatePrefixes(java.util.Map):92 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    27:27:void validatePrefixes(java.util.Map):79 -> a
-    28:28:void validatePrefixes(java.util.Map):79:79 -> a
-    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:109 -> a
-    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):88:92 -> b
-    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113:113 -> b
-    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    27:27:void validatePrefixes(java.util.Map):92 -> a
+    28:28:void validatePrefixes(java.util.Map):92:92 -> a
+    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:122 -> a
+    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):101:105 -> b
+    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126:126 -> b
+    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     7:7:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):470 -> b
-    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     8:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):474:476 -> b
-    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114:114 -> b
-    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):124:127 -> b
-    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127:127 -> b
+    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):137:140 -> b
+    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     16:16:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):448 -> b
-    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     17:34:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):449:466 -> b
-    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):128:129 -> b
-    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):118:118 -> b
-    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.D.d.S:
-    1:1:void <init>():142:142 -> <init>
+    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):141:142 -> b
+    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
+    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.D.d.U:
+    1:1:void <init>():155:155 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.D.d.U:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.D.d.W:
     boolean $assertionsDisabled -> k
     java.util.Map lensGetFieldBridges -> i
     java.util.Map lensPutFieldBridges -> j
@@ -31720,7 +31892,7 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
@@ -31737,7 +31909,7 @@
     40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
     47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
     51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.D.d.a0:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.D.d.c0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -31814,8 +31986,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.D.d.V:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.D.d.Z:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.D.d.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.D.d.b0:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -31838,7 +32010,7 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     11:11:void desugar():342 -> a
     12:12:void desugar():343:343 -> a
-    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
@@ -31854,30 +32026,30 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.D.d.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.D.d.Y:
     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.D.d.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.D.d.Z:
     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.D.d.Y:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.D.d.a0:
     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):961:961 -> 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):959:959 -> 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.D.d.b0:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.D.d.d0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -31892,7 +32064,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.D.d.c0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.D.d.e0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -31905,34 +32077,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     39:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     49:49:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     51:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282:282 -> a
@@ -31941,27 +32113,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     63:63:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     65:65:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     71:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -31970,27 +32142,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     79:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     81:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     83:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     85:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     87:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311:311 -> a
@@ -31999,34 +32171,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     97:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     99:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     101:101:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     105:105:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     107:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337:337 -> a
@@ -32035,17 +32207,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     113:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     115:115:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346:346 -> a
@@ -32054,17 +32226,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     131:131:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     133:133:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     135:135:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356:356 -> a
@@ -32073,12 +32245,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     142:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     144:144:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32087,22 +32259,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     152:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     154:154:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     156:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32111,39 +32283,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     164:164:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     166:166:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     168:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     170:170:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     179:179:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     183:183:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400:400 -> a
@@ -32152,12 +32324,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     190:190:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32166,17 +32338,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     198:198:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     200:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418:418 -> a
@@ -32185,12 +32357,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     211:211:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32199,22 +32371,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     217:217:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     219:219:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     221:221:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     223:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437:437 -> a
@@ -32223,12 +32395,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     231:231:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450:450 -> a
@@ -32239,37 +32411,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     240:240:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     244:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     247:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     251:251:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     259:259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     264:264:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510:511 -> a
@@ -32278,22 +32450,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.d0.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32301,16 +32473,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32321,356 +32493,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -32678,171 +32850,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -32850,16 +33022,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -32868,162 +33040,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33031,13 +33203,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33045,161 +33217,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33207,837 +33379,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34045,18 +34217,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34064,168 +34236,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34233,418 +34405,418 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1525:1525 -> z
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1519:1536 -> z
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4815:4829 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.D.d.d0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.D.d.f0.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
@@ -34653,23 +34825,23 @@
     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.D.d.d0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.D.d.f0.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.D.d.d0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.D.d.f0.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:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
     6:6:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):38 -> a
     7:9:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     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.D.d.d0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.D.d.f0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     boolean com.android.tools.r8.utils.BitUtils.isBitInMaskSet(int,int) -> a
     1:4:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
@@ -34678,11 +34850,11 @@
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
     14:15:int com.android.tools.r8.utils.ListUtils.lastIndexMatching(java.util.List,java.util.function.Predicate):16:17 -> a
     16:17:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
+    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
     18:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
     19:20:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
     21:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory) -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
     30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -34723,15 +34895,15 @@
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
     4:4:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):21 -> c
     5:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:24 -> c
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.d0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.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.D.d.d0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.D.d.f0.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
@@ -34778,7 +34950,7 @@
     30:30:void removeMarkedInstructions(java.util.Set):95 -> a
     31:32:void removeMarkedInstructions(java.util.Set):96:97 -> a
     33:34:void finish():105:106 -> a
-    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     35:35:void finish():106 -> a
     36:36:void finish():106:106 -> a
     1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
@@ -34809,54 +34981,61 @@
     java.util.Set revisitedMethods -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):57:64 -> <init>
-    1:6:void logResults():69:74 -> a
-    7:7:void logResults():73:73 -> a
-    8:44:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):82:118 -> a
-    45:51:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):117:123 -> a
-    52:69:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):131:148 -> a
-    70:79:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):155:164 -> a
-    80:80:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    80:80:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):165 -> a
-    81:89:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):166:174 -> a
-    90:90:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    90:90:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):178 -> a
-    91:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):179:189 -> a
-    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    102:102:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):189 -> a
-    103:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):190:200 -> a
-    114:114:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    114:114:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):201 -> a
-    115:115:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203:203 -> a
-    116:116:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    116:116:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203 -> a
-    117:117:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205:205 -> 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):961:961 -> a
-    118:118:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):204 -> a
-    119:132:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):206:219 -> a
-    133:133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    133:133:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):220 -> a
-    134:140:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):221:227 -> a
-    141:141:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    141:141:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227 -> a
-    142:142:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227:227 -> a
-    143:144:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):235:236 -> a
-    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    145:145:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237 -> a
-    146:155:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237:246 -> a
-    156:156:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    156:156:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237 -> a
-    157:168:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):250:261 -> a
-    169:177:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):260:268 -> a
-    178:178:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):263:263 -> a
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:85:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:168 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    86:86:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):169 -> a
+    87:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):170:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
+    139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    139:139:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):224 -> a
+    140:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):225:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:150:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:240 -> a
+    151:151:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    151:151:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    152:161:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:250 -> a
+    162:162:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    162:162:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    163:174:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):254:265 -> a
+    175:183:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    184:184:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.D.e.e:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
-    1:5:void <clinit>():47:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):46:46 -> <init>
+    1:5:void <clinit>():48:52 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.D.e.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -34878,14 +35057,14 @@
     55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286:292 -> a
     55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
+    62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
     62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):292 -> a
     62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293:322 -> a
     63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
     93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
@@ -34908,10 +35087,10 @@
     110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
     111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
     128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
-    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
     191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
@@ -35032,7 +35211,7 @@
     553:553:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1772 -> a
     554:556:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1774:1776 -> a
     557:570:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1930:1943 -> a
-    571:571:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    571:571:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     571:571:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1948 -> a
     572:589:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1949:1966 -> a
     590:590:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1965:1965 -> a
@@ -35106,146 +35285,145 @@
     925:939: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):3361:3375 -> a
     940:965:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3549:3574 -> a
     966:970:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3585:3589 -> a
-    971:971:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3746 -> a
-    972:972:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    972:972:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3750 -> a
-    973:985:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3751:3763 -> a
-    986:986:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    986:986:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763 -> a
-    987:995:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763:3771 -> a
-    996:996:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    996:996:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772 -> a
-    997:1004:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772:3779 -> a
-    1005:1027:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3790:3812 -> a
-    1028:1028: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
-    1028:1028:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3812 -> a
-    1029:1029:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3813:3813 -> a
-    1030:1064:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3850:3884 -> a
-    1030:1064:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3817 -> a
-    1065:1071:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3818:3824 -> a
-    1072:1072:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    1072:1072:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3825 -> a
-    1073:1087:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3826:3840 -> a
-    1088:1088:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    1088:1088:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3840 -> a
-    1089:1093:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3895:3899 -> a
-    1094:1094: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
-    1094:1094:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3899 -> a
-    1095:1099:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3900:3904 -> a
-    1100:1100:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3957:3957 -> a
-    1101:1110:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3963:3972 -> a
-    1101:1110:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1111:1111:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1111:1111:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1112:1112:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1112:1112:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969 -> a
-    1112:1112:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1113:1113:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1113:1113:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1114:1115: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):3978:3979 -> a
-    1116:1116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1116:1116: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):3980 -> a
-    1117:1117: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):3982:3982 -> a
-    1118:1118:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1118:1118: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):3982 -> a
-    1119:1120: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):3982:3983 -> a
-    1121:1130:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3993:4002 -> a
-    1131:1131:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1131:1131:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4003 -> a
-    1132:1132:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4004:4004 -> a
-    1133:1133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1133:1133:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4005 -> a
-    1134:1135:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4008:4009 -> a
-    1136:1136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    1136:1136:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4009 -> a
-    1137:1137:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4010:4010 -> a
-    1138:1138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    1138:1138:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4010 -> a
-    1139:1139:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4013:4013 -> a
-    1140:1140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    1140:1140:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4013 -> a
-    1141:1141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1141:1141:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4012 -> a
-    1142:1143:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4015:4016 -> a
-    1144:1144:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    1144:1144:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4016 -> a
-    1145:1145:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017:4017 -> a
-    1146:1146:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    1146:1146:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017 -> a
-    1147:1147:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4019:4019 -> a
-    1148:1148:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
-    1148:1148:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021 -> a
-    1149:1149:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021:4021 -> a
-    1150:1150:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1150:1150:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4019 -> a
-    1151:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4023:4024 -> a
-    1153:1153:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1153:1153:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4024 -> a
-    1154:1155:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4026:4027 -> a
-    1156:1156:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1156:1156:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4027 -> a
-    1157:1165:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029:4037 -> a
-    1166:1166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1166:1166:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4037 -> a
-    1167:1186:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4038:4057 -> a
-    1187:1190: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):1321:1324 -> a
-    1187:1190:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4057 -> a
-    1191:1210:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4058:4077 -> a
-    1211:1211:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1211:1211:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4077 -> a
-    1212:1214:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4078:4080 -> a
-    1215:1215:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1215:1215:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4080 -> a
-    1216:1217:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081:4082 -> a
-    1218:1218:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1218:1218:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081 -> a
-    1219:1219:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4083:4083 -> a
-    1220:1220:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1220:1220:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4083 -> a
-    1221:1224:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4086:4089 -> a
-    1225:1225:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1225:1225:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4089 -> a
-    1226:1226:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4091:4091 -> a
-    1227:1227:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1227:1227:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4091 -> a
-    1228:1228:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4096:4096 -> a
-    1229:1236:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4100:4107 -> a
-    1237:1247:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4120:4130 -> a
-    1237:1247:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1248:1248:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108:4108 -> a
-    1249:1274:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4153:4178 -> a
-    1249:1274:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108 -> a
-    1275:1279:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4109:4113 -> a
-    1280:1280:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1281:1281:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1282:1282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1282:1282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1282:1282:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1283:1283:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1284:1284:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1284:1284:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1285:1285:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1285:1285:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1285:1285:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1286:1286:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1286:1286:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1286:1286:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1286:1286:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1287:1287:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1287:1287:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1288:1288:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1288:1288:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1289:1289:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1289:1289:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1289:1289:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1290:1290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1290:1290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1290:1290:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1290:1290:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1291:1291:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1291:1291:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1292:1298:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4134:4140 -> a
+    971:991:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3766 -> a
+    992:992:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    992:992:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766 -> a
+    993:1009:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766:3782 -> a
+    1010:1010:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    1010:1010:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3781 -> a
+    1011:1011:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1011:1011:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780 -> a
+    1012:1023:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780:3791 -> a
+    1024:1046:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3802:3824 -> a
+    1047:1047: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
+    1047:1047:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3824 -> a
+    1048:1048:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3825:3825 -> a
+    1049:1083:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3862:3896 -> a
+    1049:1083:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3829 -> a
+    1084:1090:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3830:3836 -> a
+    1091:1091:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    1091:1091:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3837 -> a
+    1092:1106:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3838:3852 -> a
+    1107:1107:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    1107:1107:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3852 -> a
+    1108:1112:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3907:3911 -> a
+    1113:1113: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
+    1113:1113:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3911 -> a
+    1114:1118:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3912:3916 -> a
+    1119:1119:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3969:3969 -> a
+    1120:1129:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3975:3984 -> a
+    1120:1129:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1130:1130:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1130:1130:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1131:1131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1131:1131:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981 -> a
+    1131:1131:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1132:1132:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1132:1132:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1133:1134: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):3990:3991 -> a
+    1135:1135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1135:1135: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):3992 -> a
+    1136:1136: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):3994:3994 -> a
+    1137:1137:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1137:1137: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):3994 -> a
+    1138:1139: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):3994:3995 -> a
+    1140:1149:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4005:4014 -> a
+    1150:1150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1150:1150:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4015 -> a
+    1151:1151:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4016:4016 -> a
+    1152:1152:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1152:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017 -> a
+    1153:1154:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4020:4021 -> a
+    1155:1155:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    1155:1155:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021 -> a
+    1156:1156:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4022:4022 -> a
+    1157:1157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    1157:1157:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4022 -> a
+    1158:1158:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4025:4025 -> a
+    1159:1159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    1159:1159:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4025 -> a
+    1160:1160:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1160:1160:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4024 -> a
+    1161:1162:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4027:4028 -> a
+    1163:1163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    1163:1163:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4028 -> a
+    1164:1164:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029:4029 -> a
+    1165:1165:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    1165:1165:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029 -> a
+    1166:1166:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4031:4031 -> a
+    1167:1167:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    1167:1167:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4033 -> a
+    1168:1168:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4033:4033 -> a
+    1169:1169:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1169:1169:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4031 -> a
+    1170:1171:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4035:4036 -> a
+    1172:1172:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1172:1172:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4036 -> a
+    1173:1174:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4038:4039 -> a
+    1175:1175:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1175:1175:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4039 -> a
+    1176:1184:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4041:4049 -> a
+    1185:1185:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1185:1185:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4049 -> a
+    1186:1205:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4050:4069 -> a
+    1206:1209: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):1356:1359 -> a
+    1206:1209:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4069 -> a
+    1210:1229:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4070:4089 -> a
+    1230:1230:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1230:1230:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4089 -> a
+    1231:1233:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4090:4092 -> a
+    1234:1234:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1234:1234:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4092 -> a
+    1235:1236:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093:4094 -> a
+    1237:1237:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1237:1237:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093 -> a
+    1238:1238:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4095:4095 -> a
+    1239:1239:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1239:1239:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4095 -> a
+    1240:1243:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4098:4101 -> a
+    1244:1244:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1244:1244:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4101 -> a
+    1245:1245:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4103:4103 -> a
+    1246:1246:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1246:1246:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4103 -> a
+    1247:1247:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4108:4108 -> a
+    1248:1255:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4112:4119 -> a
+    1256:1266:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4132:4142 -> a
+    1256:1266:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1267:1267:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120:4120 -> a
+    1268:1293:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4165:4190 -> a
+    1268:1293:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120 -> a
+    1294:1298:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4121:4125 -> a
+    1299:1299:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1300:1300:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1300:1300:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1301:1301:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1301:1301:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1301:1301:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1302:1302:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1303:1303:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1303:1303:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1304:1304:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1304:1304:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1305:1305:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1305:1305:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1305:1305:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1305:1305:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1306:1306:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1306:1306:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1307:1307:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1307:1307:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1308:1308:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1308:1308:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1308:1308:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1309:1309:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1309:1309:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1309:1309:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1309:1309:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1310:1310:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1310:1310:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1311:1317:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4146:4152 -> a
     1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):316:317 -> b
     3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356:365 -> b
     13:13:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1098:1098 -> b
@@ -35258,7 +35436,7 @@
     87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
     87:87:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3425 -> b
     88:94:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3426:3432 -> b
-    95:96:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> b
+    95:96:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> b
     95:96:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3432 -> b
     97:98:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3433:3434 -> b
     99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
@@ -35270,9 +35448,9 @@
     104:104:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
     104:104:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3405 -> b
     105:106:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3443:3444 -> b
-    107:107:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4002:4002 -> b
-    108:110:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4243 -> b
-    111:111:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4241 -> b
+    107:107:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4014:4014 -> b
+    108:110:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4255 -> b
+    111:111:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4253 -> b
     1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1307:1323 -> c
     18:94:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1369:1445 -> c
     18:94:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1323 -> c
@@ -35307,13 +35485,13 @@
     206:206:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3256:3256 -> c
     207:226:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3255:3274 -> c
     1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):183:183 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> d
     2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):185 -> d
     3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):187:209 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> d
     26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):221 -> d
     27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):224:225 -> d
-    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> d
+    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
     29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225 -> d
     30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225:228 -> d
     1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1065:1070 -> e
@@ -35330,10 +35508,10 @@
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
     77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
     1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1978:2004 -> f
-    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> f
+    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
     28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2004 -> f
     29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2005:2005 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> f
     30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2006 -> f
     31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2008:2013 -> f
     37:50:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2042:2055 -> f
@@ -35343,7 +35521,7 @@
     51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     52:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2056:2058 -> f
     52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> f
+    55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
     55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2058 -> f
     55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     56:63:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2059:2066 -> f
@@ -35360,7 +35538,7 @@
     95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2014:2036 -> f
     1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3640:3640 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> g
     2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3644 -> g
     3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3645:3660 -> g
     19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> g
@@ -35369,7 +35547,7 @@
     62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> g
     62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3660 -> g
     63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3707:3707 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> h
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> h
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3711 -> h
     2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3712:3723 -> h
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> h
@@ -35379,7 +35557,7 @@
     30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3723 -> h
     31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3742:3742 -> h
     1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791:1791 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> i
     2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791 -> i
     3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1794:1805 -> i
     15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
@@ -35392,7 +35570,7 @@
     77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> i
     77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1873 -> i
     78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1874:1880 -> i
-    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> i
+    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
     85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880 -> i
     86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880:1882 -> i
     1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):859:868 -> j
@@ -35467,17 +35645,17 @@
     41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
     41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):303 -> k
     42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):312:312 -> k
-    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3914:3918 -> l
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3926:3930 -> l
     6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3919 -> l
-    7:26:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3920:3939 -> l
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3931 -> l
+    7:26:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3932:3951 -> l
     27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
-    27:27:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3940 -> l
+    27:27:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3952 -> l
     28:28:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object) -> l
-    28:28:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3941 -> l
+    28:28:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3953 -> l
     29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    29:29:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3944 -> l
-    30:38:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3945:3953 -> l
+    29:29:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3956 -> l
+    30:38:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3957:3965 -> l
     1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2353:2407 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
@@ -35486,7 +35664,7 @@
     58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2409:2411 -> m
     61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2396:2422 -> m
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652:2652 -> n
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> n
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652 -> n
     3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2655:2661 -> n
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
@@ -35554,7 +35732,7 @@
     66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3481:3515 -> p
     67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> p
     102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3516 -> p
     102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3518:3539 -> p
@@ -35586,7 +35764,7 @@
     207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
     207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3122 -> p
     208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3128:3130 -> p
-    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> p
+    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
     211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130 -> p
     212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130:3132 -> p
     1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2209:2211 -> q
@@ -35613,12 +35791,12 @@
     26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
     26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2274 -> r
     27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2262:2280 -> r
-    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4240:4274 -> s
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4252:4286 -> s
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4274 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4286 -> s
     37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4275 -> s
-    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4278:4285 -> s
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4287 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4290:4297 -> s
     1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1117:1131 -> t
     16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):371:389 -> t
     16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1132 -> t
@@ -35681,7 +35859,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):548:548 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):558:558 -> a
     4:15:com.android.tools.r8.ir.code.BasicBlock build():563:574 -> a
-    16:19: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):1321:1324 -> a
+    16:19: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):1356:1359 -> a
     16:19:com.android.tools.r8.ir.code.BasicBlock build():574 -> a
     20:22:com.android.tools.r8.ir.code.BasicBlock build():576:578 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):553:553 -> b
@@ -35740,11 +35918,11 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():4185:4185 -> <clinit>
-    1:8:void <init>():4185:4192 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4185:4185 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4195:4197 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):4201:4233 -> b
+    1:1:void <clinit>():4197:4197 -> <clinit>
+    1:8:void <init>():4197:4204 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4197:4197 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4207:4209 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):4213:4245 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
@@ -35755,7 +35933,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):485:485 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
     4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):496:517 -> 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):1351:1354 -> 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):1386:1389 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):517 -> a
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):518:519 -> 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):508:508 -> a
@@ -35848,142 +36026,96 @@
     40:59:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):122:141 -> b
 com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
+    boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.IRCode code -> d
-    int inliningInstructionLimit -> h
+    int instructionAllowance -> h
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
-    int instructionAllowance -> i
+    int inliningInstructionLimit -> g
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
-    com.android.tools.r8.ir.optimize.InliningInfo info -> g
     java.util.function.Predicate isProcessedConcurrently -> f
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):59:68 -> <init>
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):65:73 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    1:14:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):79:92 -> a
-    15:15:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    15:15:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):93 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):83:83 -> a
-    17:17:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):84 -> a
-    18:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):101:124 -> a
+    boolean isForcedInliningOracle() -> a
+    1:15:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):89:103 -> a
+    16:16:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):86:86 -> a
+    17:40:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):111:134 -> a
+    41:41:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):118 -> a
     42:42:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):108 -> a
-    43:43:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    43:43:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    44:45:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):104:105 -> a
-    46:61:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):139:154 -> a
-    62:82: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):150:170 -> a
-    83:83:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    83:83: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):170 -> a
-    84:84: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):152:152 -> a
-    85:92:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):181:188 -> a
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    93:93:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188 -> a
-    94:103:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188:197 -> a
-    104:104:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    104:104:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):198 -> a
-    105:106:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):208:209 -> a
-    107:107:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    107:107:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):210 -> a
-    108:122:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):215:229 -> a
-    123:123:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    123:123:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):230 -> a
-    124:129:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235:240 -> a
-    130:130:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    130:130:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):241 -> a
-    131:137:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):246:252 -> a
-    138:138:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    138:138:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):253 -> a
-    139:148:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):258:267 -> a
-    149:149:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    149:149:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):268 -> a
-    150:160:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):273:283 -> a
-    161:163:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):282:284 -> a
-    164:164:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    164:164:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):285 -> a
-    165:165:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    166:177:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):315:326 -> a
-    166:177:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):299 -> a
-    178:185:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):300:307 -> a
-    186:186:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):304:304 -> a
-    187:195:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):338:346 -> a
-    196:196:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    196:196:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):347 -> a
-    197:202:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):352:357 -> a
-    203:203:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    203:203:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):357 -> a
-    204:205:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):360:361 -> a
-    206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    206:206:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):361 -> a
-    207:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):365:367 -> a
-    210:210:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    210:210:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):367 -> a
-    211:211:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368:368 -> a
-    212:212:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    212:212:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368 -> a
-    213:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368:380 -> a
-    226:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):379:388 -> a
-    236:242:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):384:390 -> a
-    243:252:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):402:411 -> a
-    253:253:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    253:253:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    254:254:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    254:254:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    254:254:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    255:255:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    255:255:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    256:257:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):418:419 -> a
-    258:258:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    258:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    259:259:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    259:259:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    259:259:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    260:260:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    260:260:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    261:265:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):425:429 -> a
-    266:266:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    266:266:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    267:267:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    267:267:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    268:268:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):432:432 -> a
-    269:269:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):439:439 -> a
-    270:270:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    270:270:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    271:271:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokePolymorphic.getType():51:51 -> a
-    271:271:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    271:271:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    272:272:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    272:272:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    273:275:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):448:450 -> a
-    276:276:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    276:276:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):450 -> a
-    277:277:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
-    278:278:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):460:460 -> a
-    279:289:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:675 -> a
-    279:289:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    290:290:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    290:290:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):684 -> a
-    290:290:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    291:329:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):685:723 -> a
-    291:329:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    330:330:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    330:330:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):684 -> a
-    330:330:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    331:331:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:665 -> a
-    331:331:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    332:332:boolean stillHasBudget():466:466 -> a
-    333:333:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471:471 -> a
-    334:334:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    334:334:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    335:370:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):475:510 -> a
-    371:371:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    371:371:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    372:372:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):516:516 -> a
-    373:397:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):522:546 -> a
-    398:405:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):558:565 -> a
-    1:2:void finish():73:74 -> b
-    3:4:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> b
+    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    43:44:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
+    45: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):150:165 -> a
+    61:81: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):161:181 -> a
+    82:82:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    82:82: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):181 -> a
+    83:83: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):185:185 -> a
+    84:84:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    84:84: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):181 -> a
+    85:85: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):163:163 -> a
+    86:94: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):200:208 -> a
+    95:95:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    95:95: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):208 -> a
+    96: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):208:296 -> a
+    185:187: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):295:297 -> a
+    188:188:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
+    189:200:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:329 -> a
+    189:200:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):310 -> a
+    201:201:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    202:202:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):340:340 -> a
+    203:213:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):349:359 -> a
+    214:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):358:368 -> a
+    225:225:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    225:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):368 -> a
+    226:231:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370:375 -> a
+    232:232:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    232:232:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):375 -> a
+    233:233:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376:376 -> a
+    234:234:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    234:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376 -> a
+    235:246:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376:387 -> a
+    247:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):400:411 -> a
+    259:274:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:425 -> a
+    275:277:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):431:433 -> a
+    278:278:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    278:278:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):433 -> a
+    279:279:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):435:435 -> a
+    280:311:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):453:484 -> a
+    312:312:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    312:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484 -> a
+    313:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):487:492 -> a
+    319:319:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    319:319:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484 -> a
+    320:338:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):495:513 -> a
+    339:339:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    339:339:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):514 -> a
+    340:341:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):516:517 -> a
+    342:342:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    342:342:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):514 -> a
+    343:351:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):523:531 -> a
+    352:352:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    352:352:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):532 -> a
+    353:355:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:536 -> a
+    356:356:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    356:356:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):532 -> a
+    357:357:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:544 -> a
+    358:358:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551:551 -> a
+    359:359:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    359:359:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    360:362:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):554:556 -> a
+    363:363:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    363:363:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    364:364:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566:566 -> a
+    365:365:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    365:365:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    366:406:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):570:610 -> a
+    407:407:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    407:407:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    408:408:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):621:621 -> a
+    409:433:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):627:651 -> a
+    434:441:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):663:670 -> a
+    1:2:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):191:192 -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.x:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -36000,7 +36132,7 @@
     109:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148 -> a
     110:124:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):153:167 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
     146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -36015,7 +36147,7 @@
     153:153:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):202 -> a
     154:164:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):205:215 -> a
     165:176:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):214:225 -> a
-    177:177:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    177:177:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     177:177:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225 -> a
     178:180: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.D.e.y:
@@ -36042,10 +36174,10 @@
     80:80:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     80:80:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130 -> a
     80:80:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):154:169 -> a
-    1:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:149 -> b
-    10:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
-    10:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):149 -> b
+    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.z:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36056,23 +36188,24 @@
     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.D.e.A:
-    java.util.Map invokesToInline -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):30:32 -> <init>
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
+    java.util.Map invokesToInline -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):35:38 -> <init>
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):42:42 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):50:50 -> a
-    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):105:108 -> a
-    void finish() -> b
-    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):54:64 -> b
+    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):48:52 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):61:61 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):71:71 -> a
+    8:11:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):124:127 -> a
+    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):75:85 -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36151,68 +36284,69 @@
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
 com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.J:
-    java.util.Set blackList -> g
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
-    java.util.Set doubleInlineCallers -> d
-    java.util.Set doubleInlineSelectedTargets -> e
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> h
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
-    java.util.Map doubleInlineeCandidates -> f
-    boolean applyDoubleInlining -> c
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):62:77 -> <init>
-    1:2:void fillInBlackList():81:82 -> a
-    3:6:boolean isBlackListed(com.android.tools.r8.graph.DexMethod):86:89 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
-    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    10:15:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):890:895 -> a
-    10:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    16:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):105:117 -> a
-    29:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):95:97 -> a
-    29:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):118 -> a
-    32:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):119:124 -> a
-    38:43:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):146:151 -> a
-    44:54:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):155:165 -> a
-    55:56:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> a
-    57:64:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:213 -> a
-    65:78:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):212:225 -> a
-    79:83:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:219 -> a
-    84:90:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:221 -> a
-    91:115:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):619:643 -> a
-    116:117:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):746:747 -> a
-    118:126:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):756:764 -> a
-    127:127:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    127:127:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):758 -> a
-    128:128:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):765:765 -> a
-    129:129:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    130:141:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):792:803 -> a
-    142:142:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    142:142:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):804 -> a
-    143:148:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):805:810 -> a
-    149:149:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    149:149:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):810 -> a
-    150:158:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:821 -> a
-    159:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819:844 -> a
-    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    185:185:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):849 -> a
-    186:187:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):850:851 -> a
-    188:197:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):905:914 -> a
-    188:197:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):857 -> a
-    198:230:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):851:883 -> a
-    231:231:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
-    231:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):884 -> a
-    232:233:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):885:886 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):130:136 -> b
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
+    java.util.Set blackList -> b
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):74:74 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):66:79 -> <init>
+    1:23:boolean isBlackListed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):84:106 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    27:32:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):861:866 -> a
+    27:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    33:45:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):126:138 -> a
+    46:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:118 -> a
+    46:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):139 -> a
+    49:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):140:145 -> a
+    55:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):167:172 -> a
+    61:71:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):176:186 -> a
+    72:73:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):191:192 -> a
+    74:81:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):227:234 -> a
+    82:95:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):233:246 -> a
+    96:100:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:240 -> a
+    101:107:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:242 -> a
+    108:132:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):640:664 -> a
+    133:134:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):689:690 -> a
+    135:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):699:707 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    144:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):701 -> a
+    145:145:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):708:708 -> a
+    146:146:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    147:158:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):735:746 -> a
+    159:159:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    159:159:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):747 -> a
+    160:190:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):748:778 -> a
+    191:198:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):849:856 -> a
+    191:198:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    199:199:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):854:854 -> a
+    199:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    200:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783:783 -> a
+    201:228:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):779:806 -> a
+    229:229:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    229:229:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):811 -> a
+    230:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):812:813 -> a
+    232:241:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):876:885 -> a
+    232:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819 -> a
+    242:271:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:842 -> a
+    272:272:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
+    272:272:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):843 -> a
+    273:274:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):844:845 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:157 -> b
     8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):188:199 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):176:182 -> c
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):209:220 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):197:203 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.D:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -36223,61 +36357,61 @@
     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>():235:251 -> <clinit>
-    18:47:void <clinit>():235:264 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):255:256 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():235:235 -> a
-    1:1:boolean isSet(int):268:268 -> b
+    1:17:void <clinit>():256:272 -> <clinit>
+    18:47:void <clinit>():256:285 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):276:277 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():256:256 -> a
+    1:1:boolean isSet(int):289:289 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():286:294 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):296:299 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):302:306 -> <init>
-    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):329:352 -> a
-    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):358:369 -> a
-    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):374:424 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):498:508 -> a
-    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> a
-    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):425:432 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):475:490 -> a
-    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> a
-    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):436:470 -> a
-    1:5:boolean equals(java.lang.Object):319:323 -> equals
-    1:4:int hashCode():311:314 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():40:40 -> hashCode
-    5:5:int hashCode():314 -> hashCode
+    1:9:void <clinit>():307:315 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):317:320 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):323:327 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):350:373 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):379:390 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):395:445 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):519:529 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):446:453 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):496:511 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> a
+    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:491 -> a
+    1:5:boolean equals(java.lang.Object):340:344 -> equals
+    1:4:int hashCode():332:335 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
+    5:5:int hashCode():335 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.F:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():533:533 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):541:544 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():548:548 -> a
-    2:37:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):557:592 -> a
+    1:1:void <clinit>():554:554 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):562:565 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():569:569 -> a
+    2:37:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):578:613 -> a
     38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):593 -> a
-    39:47:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):594:602 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):614 -> a
+    39:47:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):615:623 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.G:
     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):611:613 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.H:
     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):735:737 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.I:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():521:525 -> <clinit>
-    1:1:void <init>(java.lang.String,int):520:520 -> <init>
+    1:5:void <clinit>():542:546 -> <clinit>
+    1:1:void <init>(java.lang.String,int):541:541 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.K:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -36332,44 +36466,20 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):224:224 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> g
-com.android.tools.r8.ir.optimize.InliningInfo -> com.android.tools.r8.D.e.P:
-    java.util.List edges -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexEncodedMethod):70:73 -> <init>
-    1:1:void exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    1:4:java.lang.String toString():86:89 -> toString
-    5:9:void com.android.tools.r8.ir.optimize.InliningInfo$Edge.appendOn(java.lang.StringBuffer):29:33 -> toString
-    5:9:java.lang.String toString():90 -> toString
-    10:13:java.lang.String toString():91:94 -> toString
-com.android.tools.r8.ir.optimize.InliningInfo$Edge -> com.android.tools.r8.D.e.L:
-    com.android.tools.r8.ir.optimize.InliningInfo$Node inlinee -> b
-    com.android.tools.r8.graph.DexMethod declared -> a
-    1:4:void <init>(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.InliningInfo$Node):22:25 -> <init>
-com.android.tools.r8.ir.optimize.InliningInfo$Inlining -> com.android.tools.r8.D.e.M:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> <init>
-    1:1:void appendOn(java.lang.StringBuffer):50:50 -> a
-com.android.tools.r8.ir.optimize.InliningInfo$Node -> com.android.tools.r8.D.e.N:
-    1:1:void <init>():37:37 -> <init>
-    void appendOn(java.lang.StringBuffer) -> a
-com.android.tools.r8.ir.optimize.InliningInfo$NotInlining -> com.android.tools.r8.D.e.O:
-    java.lang.String reason -> a
-    1:2:void <init>(java.lang.String):58:59 -> <init>
-    1:2:void appendOn(java.lang.StringBuffer):64:65 -> a
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.Q:
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod) -> a
-    void finish() -> b
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.S:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.L:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,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
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.M:
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.T:
+    boolean willExceedBudget(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.D.e.N:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -36377,7 +36487,7 @@
     3:12:int doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> a
     3:12:int doHash(java.lang.Object):11 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.U:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.O:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -36406,7 +36516,7 @@
     3:3:boolean hasSeenStrictlyAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):209:209 -> 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.D.e.X:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.D.e.S:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -36485,22 +36595,22 @@
     275:291: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):392:408 -> a
     275:291:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
     292:293:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):446:447 -> a
-    294:294:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    294:294:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     294:294:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447 -> a
     295:297:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:449 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.V:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.P:
     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):64:66 -> <init>
     1:5:boolean equals(java.lang.Object):71:75 -> equals
     1:1:int hashCode():80:80 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.W:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.Q:
     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>():54:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.Y:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.T:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -36530,16 +36640,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -36575,7 +36685,7 @@
     3:3:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):76:76 -> e
     1:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):54:78 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.Z:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.U:
     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>
@@ -36583,7 +36693,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.D.e.a0:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.D.e.V:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -36617,17 +36727,17 @@
     58:58:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
     58:58:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):128 -> a
     59:60:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):128:129 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.b0:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.W:
     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():881:881 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
     37:52:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):64:79 -> a
     53:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.c0:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.X:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
@@ -36665,7 +36775,7 @@
     188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):239 -> a
     189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):240:249 -> a
-    199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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 insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249 -> a
     200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249:249 -> a
     201:261:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):303:363 -> a
@@ -36685,7 +36795,7 @@
     333:378:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):471:516 -> a
     333:378:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):450 -> a
     379:384:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):456:461 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.p0:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.k0:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -36694,39 +36804,39 @@
     java.util.Set methodsSelectedForOutlining -> b
     com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
     1:1:void <clinit>():106:106 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1262:1262 -> <init>
-    2:1157:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1264 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1273:1273 -> <init>
+    2:1168:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1275 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):106:106 -> a
-    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1275:1277 -> a
-    5:10:java.util.List selectOutlines():1369:1374 -> a
-    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1312 -> a
-    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1313:1321 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):579:579 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1322 -> a
-    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323:1332 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1332 -> a
-    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333:1341 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1341 -> a
-    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1342:1364 -> a
+    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1286:1288 -> a
+    5:10:java.util.List selectOutlines():1380:1385 -> a
+    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323 -> a
+    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1324:1332 -> a
+    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
+    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
+    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
+    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
+    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
     65:65:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
-    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1364 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
     66:66:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> a
-    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1364 -> a
-    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1381:1387 -> a
-    74:75:boolean checkAllOutlineSitesFoundAgain():1392:1393 -> a
+    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
+    74:75:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):106:106 -> b
-    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1283:1285 -> b
-    5:5:java.util.Set getMethodsSelectedForOutlining():1305:1305 -> b
+    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1294:1296 -> b
+    5:5:java.util.Set getMethodsSelectedForOutlining():1316:1316 -> b
     void noProcessing(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> c
     1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):106:106 -> c
-    2:4:java.util.function.BiConsumer identifyCandidateMethods():1272:1274 -> c
+    2:4:java.util.function.BiConsumer identifyCandidateMethods():1283:1285 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):106:106 -> d
-    2:8:boolean selectMethodsForOutlining():1290:1296 -> d
-    9:15:boolean selectMethodsForOutlining():1295:1301 -> d
+    2:8:boolean selectMethodsForOutlining():1301:1307 -> d
+    9:15:boolean selectMethodsForOutlining():1306:1312 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):106:106 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.d0:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.Y:
     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):209:210 -> <init>
     java.lang.String getDetailsString() -> a
@@ -36736,11 +36846,11 @@
     5:5:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):236 -> a
     6:11:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):238:243 -> a
     12:16:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):268:272 -> a
-    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     17:17:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):274 -> a
     18:19:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:277 -> a
     20:23:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:279 -> a
-    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     24:24:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281 -> a
     25:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281:300 -> a
     45:45:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):297:297 -> a
@@ -36754,7 +36864,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():221 -> hashCode
     2:2:int hashCode():221:221 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.e0:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.Z:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -36770,14 +36880,14 @@
     14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):433:452 -> a
     34:34:java.lang.String getDetailsString():458:458 -> a
     35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):487:489 -> a
-    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):491 -> a
     39:44:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):477:482 -> a
     39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493 -> a
     45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493:498 -> a
     51:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498 -> a
-    52:52:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    52:52:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     52:52:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500 -> a
     53:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500:503 -> a
     57:57: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
@@ -36790,7 +36900,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():409 -> hashCode
     2:6:int hashCode():409:413 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.f0:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.a0:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):311:312 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):332:332 -> a
@@ -36801,7 +36911,7 @@
     6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):361:362 -> a
     8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):362 -> a
-    9:9:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    9:9:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     9:9:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364 -> a
     10:12:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364:366 -> a
     1:1:java.lang.String getInstructionName():346:346 -> b
@@ -36811,7 +36921,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():327 -> hashCode
     2:2:int hashCode():327:327 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.g0:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.b0:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -36821,36 +36931,36 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():531:531 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):548:548 -> <init>
-    2:27:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:560 -> <init>
-    28:28:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
-    1:5:com.android.tools.r8.graph.DexProto buildProto():570:574 -> a
+    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:562 -> <init>
+    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
+    1:5:com.android.tools.r8.graph.DexProto buildProto():572:576 -> a
     1:1:int compareTo(java.lang.Object):531:531 -> compareTo
-    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):627:632 -> compareTo
+    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):629:634 -> compareTo
     2:7:int compareTo(java.lang.Object):531 -> compareTo
-    8:8:int argumentCount():566:566 -> compareTo
-    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632 -> compareTo
+    8:8:int argumentCount():568:568 -> compareTo
+    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634 -> compareTo
     8:8:int compareTo(java.lang.Object):531 -> compareTo
-    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632:663 -> compareTo
+    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634:665 -> compareTo
     9:40:int compareTo(java.lang.Object):531 -> compareTo
-    1:18:boolean equals(java.lang.Object):584:601 -> equals
-    1:6:int hashCode():609:614 -> hashCode
-    1:37:java.lang.String toString():670:706 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.D.e.h0:
-    com.android.tools.r8.ir.optimize.Outliner this$0 -> c
-    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> b
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1555:1556 -> <init>
+    1:18:boolean equals(java.lang.Object):586:603 -> equals
+    1:6:int hashCode():611:616 -> hashCode
+    1:37:java.lang.String toString():672:708 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.D.e.c0:
+    com.android.tools.r8.ir.optimize.Outliner this$0 -> d
+    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1566:1567 -> <init>
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper) -> a
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1582:1583 -> a
+    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):1593:1594 -> a
     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 -> a
-    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):1583 -> a
-    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):1583:1583 -> a
-    5:5:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1593:1593 -> a
-    1:1:boolean computeEquals(java.lang.Object):1603:1603 -> b
-    1:1:int computeHashCode():1598:1598 -> h
+    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):1594 -> a
+    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):1594:1594 -> a
+    5:5:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1604:1604 -> a
+    1:1:boolean computeEquals(java.lang.Object):1614:1614 -> b
+    1:1:int computeHashCode():1609:1609 -> h
     int estimatedSizeForInlining() -> l
     boolean isOutlineCode() -> o
-    1:1:java.lang.String toString():1588:1588 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.D.e.j0:
+    1:1:java.lang.String toString():1599:1599 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.D.e.e0:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():122:122 -> <clinit>
@@ -36862,7 +36972,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.D.e.i0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.D.e.d0:
     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
@@ -36875,66 +36985,66 @@
     8:8:void <clinit>():127:127 -> <clinit>
     1:1:void <init>(java.lang.String,int):127:127 -> <init>
     1:22:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType fromInstruction(com.android.tools.r8.ir.code.Instruction):137:158 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.k0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.f0:
     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):1137:1139 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1144:1146 -> a
-    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1150:1151 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.l0:
+    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):1148:1150 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1155:1157 -> a
+    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1161:1162 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.g0:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.optimize.Outliner this$0 -> u
     int argumentsMapIndex -> t
-    1:1:void <clinit>():1171:1171 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1180:1184 -> <init>
-    1:53:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1189:1241 -> a
+    1:1:void <clinit>():1182:1182 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1191:1195 -> <init>
+    1:53:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1252 -> a
     54:54:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    54:54:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1241 -> a
-    55:61:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1242:1248 -> a
-    62:64:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1255:1257 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.m0:
+    54:54:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
+    55:61:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
+    62:64:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.h0:
     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):1158:1159 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1164:1166 -> a
-    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1165:1165 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.D.e.n0:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1169:1170 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1175:1177 -> a
+    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1176:1176 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.D.e.i0:
     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 <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1408:1408 -> <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):1406:1410 -> <init>
+    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):1419:1419 -> <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):1417:1421 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():1415:1415 -> a
-    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1446:1446 -> a
-    3:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1460:1465 -> a
+    1:1:int instructionCount():1426:1426 -> a
+    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1457:1457 -> a
+    3:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1471:1476 -> a
     9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    9:9:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1465 -> a
-    10:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1466:1469 -> a
-    14:14:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1475:1475 -> a
-    15:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1486:1490 -> a
-    20:20:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
-    20:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490 -> a
-    21:30:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490:1499 -> a
-    31:31:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1505:1505 -> a
-    32:32:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1511:1511 -> a
-    33:33:int getMoveExceptionRegister(int):1521:1521 -> a
+    9:9:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1476 -> a
+    10:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1477:1480 -> a
+    14:14:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1486:1486 -> a
+    15:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1497:1501 -> a
+    20:20:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
+    20:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501 -> a
+    21:30:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501:1510 -> a
+    31:31:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1516:1516 -> a
+    32:32:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1522:1522 -> a
+    33:33:int getMoveExceptionRegister(int):1532:1532 -> 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):1526:1526 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1531:1531 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1537:1537 -> d
+    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1542:1542 -> 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.D.e.o0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.j0:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -36951,51 +37061,79 @@
     java.util.List arguments -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.optimize.Outliner this$0 -> o
-    1:1:void <clinit>():714:714 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):733:733 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):719:736 -> <init>
+    1:1:void <clinit>():716:716 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):735:735 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):721:738 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline) -> a
-    1:4:java.util.List getInstructionArray():740:743 -> a
-    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):765:770 -> a
-    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):910:922 -> a
-    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):927:933 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):933 -> a
-    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):937:943 -> 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):949:981 -> a
-    72:79:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1059:1066 -> a
-    80:115:void candidate(int,int):1074:1109 -> a
-    116:126:void reset(int):1114:1124 -> a
-    1:1:void invalidateInstructionArray():748:748 -> b
-    1:5:void process():754:758 -> c
-    6:9:void processInstruction(com.android.tools.r8.ir.code.Instruction):781:784 -> c
-    6:9:void process():758 -> c
-    10:96:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):818:904 -> c
-    10:96:void processInstruction(com.android.tools.r8.ir.code.Instruction):792 -> c
-    10:96:void process():758 -> c
-    97:97:void processInstruction(com.android.tools.r8.ir.code.Instruction):796:796 -> c
-    97:97:void process():758 -> c
-    98:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):989:1013 -> c
-    98:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    98:122:void process():758 -> c
-    123:150:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1011:1038 -> c
-    123:150:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    123:150:void process():758 -> c
-    151:154:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1037:1040 -> c
-    151:154:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    151:154:void process():758 -> c
-    155:182:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1022:1049 -> c
-    155:182:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    155:182:void process():758 -> c
-    183:189:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1047:1053 -> c
-    183:189:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    183:189:void process():758 -> c
-    190:190:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1051:1051 -> c
-    190:190:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    190:190:void process():758 -> c
-    191:201:void processInstruction(com.android.tools.r8.ir.code.Instruction):801:811 -> c
-    191:201:void process():758 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.q0:
+    1:4:java.util.List getInstructionArray():742:745 -> a
+    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
+    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
+    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
+    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
+    39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
+    72:79:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1071:1078 -> a
+    80:115:void candidate(int,int):1085:1120 -> a
+    116:126:void reset(int):1125:1135 -> a
+    1:1:void invalidateInstructionArray():750:750 -> b
+    1:5:void process():756:760 -> c
+    6:16:void processInstruction(com.android.tools.r8.ir.code.Instruction):783:793 -> c
+    6:16:void process():760 -> c
+    17:103:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):826:912 -> c
+    17:103:void processInstruction(com.android.tools.r8.ir.code.Instruction):800 -> c
+    17:103:void process():760 -> c
+    104:104:void processInstruction(com.android.tools.r8.ir.code.Instruction):804:804 -> c
+    104:104:void process():760 -> c
+    105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
+    105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    105:113:void process():760 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
+    114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    114:114:void process():760 -> c
+    115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
+    115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    115:121:void process():760 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
+    122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    122:122:void process():760 -> c
+    123:131:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1017:1025 -> c
+    123:131:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    123:131:void process():760 -> c
+    132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
+    132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    132:137:void process():760 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
+    138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    138:138:void process():760 -> c
+    139:159:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1030:1050 -> c
+    139:159:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    139:159:void process():760 -> c
+    160:163:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1049:1052 -> c
+    160:163:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    160:163:void process():760 -> c
+    164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
+    164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    164:172:void process():760 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
+    173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    173:173:void process():760 -> c
+    174:179:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1056:1061 -> c
+    174:179:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    174:179:void process():760 -> c
+    180:186:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1059:1065 -> c
+    180:186:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    180:186:void process():760 -> c
+    187:187:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1063:1063 -> c
+    187:187:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    187:187:void process():760 -> c
+    188:198:void processInstruction(com.android.tools.r8.ir.code.Instruction):809:819 -> c
+    188:198:void process():760 -> c
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.l0:
     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
@@ -37031,7 +37169,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():1443:1443 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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
@@ -37043,20 +37181,20 @@
     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():1443:1443 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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():1443:1443 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     391: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():1443:1443 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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.D.e.r0:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.D.e.m0:
     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
@@ -37078,7 +37216,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.D.e.u0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.D.e.p0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -37134,15 +37272,15 @@
     173:176:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):248:251 -> a
     173:176:void run():229 -> a
     177:178:void run():231:232 -> a
-    179:179:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    179:179:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     179:179:void run():232 -> a
     180:182:void run():232:234 -> a
     183:183:boolean lambda$run$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):189:189 -> a
     184:210:void killActiveFields(com.android.tools.r8.ir.code.FieldInstruction):262:288 -> a
     211:214:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.FieldInstruction):309:312 -> a
     1:2:void killAllActiveFields():257:258 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.s0:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.t0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.n0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.o0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -37152,7 +37290,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.D.e.v0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.D.e.q0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:12:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:47 -> a
@@ -37174,7 +37312,7 @@
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     97:97:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):172:198 -> a
@@ -37191,77 +37329,98 @@
     131:131: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):358:358 -> a
     131:131:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
     132:141:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):63:72 -> a
-    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     142:142:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72 -> a
     143:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.x0:
-    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):65:65 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):66 -> a
-    3:28:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):67:92 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    29:29:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):92 -> a
-    30:55:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):93:118 -> a
-    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    56:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118 -> a
-    57:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118:120 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    60:60:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):121 -> a
-    61:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):122:125 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    65:65:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):121 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.s0:
+    com.android.tools.r8.graph.AppView appView -> c
+    java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
+    com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
+    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
+    4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
+    31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
+    58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
+    62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
     66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    66:66:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118 -> a
-    67:84:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):131:148 -> a
-    85:85:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    85:85:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):92 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.w0:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> d
-    com.android.tools.r8.ir.code.MemberType memberType -> f
-    com.android.tools.r8.ir.code.Value valueArray -> g
-    int index -> h
-    com.android.tools.r8.ir.code.IRCode code -> c
-    com.android.tools.r8.ir.code.InstructionListIterator iterator -> e
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):200:200 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):194:205 -> <init>
+    66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
+    68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
+    88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
+    104:124:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    125:125:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    126:126:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
+    127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
+    139:146:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    147:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):46:54 -> a
+    147:155:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    147:155:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    156:171:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):51:66 -> a
+    156:171:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    156:171:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    172:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):64:64 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    173:195:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):57:79 -> a
+    173:195:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    173:195:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    196:196:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    196:196:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    196:196:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    197:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):72:98 -> a
+    197:223:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    197:223:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):96:96 -> a
+    224:224:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    224:224:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    225:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):86:111 -> a
+    225:250:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    225:250:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    251:252:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
+    251:252:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    253:253:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
+    255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.r0:
+    com.android.tools.r8.ir.code.IRCode code -> a
+    com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
+    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):260:263 -> <init>
     boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):209:210 -> a
-    3:6:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):289:292 -> a
-    3:6:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):214 -> a
-    7:22:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):215:230 -> a
-    23:23:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    23:23:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):230 -> a
-    24:24:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231:231 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    25:25:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231 -> a
-    26:40:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231:245 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    41:41:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):245 -> a
-    42:42:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    42:42:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):244 -> a
-    43:54:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):246:257 -> a
-    55:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    55:55:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):256 -> a
-    56:59:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):258:261 -> a
-    60:60:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):215:215 -> a
-    61:66:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):265:270 -> a
-    67:67:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    67:67:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):270 -> a
-    68:68:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):271:271 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    69:69:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):271 -> a
-    70:72:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):272:274 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    73:73:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276 -> a
-    74:77:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276:279 -> a
-    78:78:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    78:78:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):279 -> a
-    79:84:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):280:285 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.y0:
+    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):270:270 -> a
+    2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):286:289 -> a
+    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):269 -> a
+    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):270:282 -> a
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.t0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -37299,7 +37458,7 @@
     61:61:void replaceSwitchByOptimizedSwitch(int):140:140 -> b
     61:61:boolean optimize():66 -> b
     1:12:java.util.function.IntPredicate computeSuccessorHasBecomeDeadPredicate():91:102 -> c
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.z0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.u0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -37311,15 +37470,15 @@
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):91:98 -> a
     16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> a
     17:18:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:104 -> a
-    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
-    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
     59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.A0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.B0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.v0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.w0:
     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
@@ -37327,7 +37486,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.D.e.E0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.D.e.z0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -37380,7 +37539,7 @@
     298:318:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):536:556 -> a
     298:318:void rewrite(com.android.tools.r8.ir.code.IRCode):415 -> a
     319:320:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
-    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     321:321:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
     322:322:void rewrite(com.android.tools.r8.ir.code.IRCode):426:426 -> a
     323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
@@ -37403,19 +37562,19 @@
     14:14: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
     15:18: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
     19:29: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.D.e.C0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.D.e.x0:
     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.D.e.D0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.D.e.y0:
     boolean $assertionsDisabled -> l
     java.util.Map removedArgumentsInfoPerMethod -> k
     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 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.K0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.F0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -37457,14 +37616,14 @@
     1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> c
     19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.F0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.G0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.A0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.B0:
     java.util.BitSet used -> a
     1:3:void <init>():347:349 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
     1:1:java.util.BitSet getUsedArguments():352:352 -> a
     2:2:boolean register(int):357:357 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.H0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.C0:
     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>
@@ -37474,11 +37633,11 @@
     6:14:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):196:204 -> a
     15:17: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
     18:18: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.D.e.I0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.D.e.D0:
     java.util.Map removedArguments -> k
     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 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.J0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.E0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -37502,7 +37661,7 @@
     24:24: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
     25:25: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
     26:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174:174 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.L0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.G0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -37528,19 +37687,19 @@
     31:31:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):265:266 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
-    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     34:34:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
     95:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
-    98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     98:98:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235 -> a
     99:120:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235:256 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.G0.a:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNKNOWN_TYPE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NON_PROGRAM_CLASS -> d
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNUSED_INSTANCE -> a
@@ -37558,7 +37717,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus PINNED_FIELD -> n
     1:20:void <clinit>():37:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.L0.c:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.G0.c:
     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
@@ -37586,13 +37745,13 @@
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     46:46:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     47:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.L0.d:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.G0.d:
     int estimatedCombinedSizeForInlining -> o
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALLOWED_ZERO_TEST_TYPES -> p
     com.android.tools.r8.graph.AppView appView -> a
@@ -37610,146 +37769,147 @@
     java.util.Map methodCallsOnInstance -> l
     java.util.List unusedArguments -> n
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:3:void <clinit>():60:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):93:93 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):77:100 -> <init>
-    1:1:int getEstimatedCombinedSizeForInlining():104:104 -> a
+    1:3:void <clinit>():61:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):94:94 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):78:101 -> <init>
+    1:1:int getEstimatedCombinedSizeForInlining():105:105 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581 -> a
-    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581:581 -> a
+    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582 -> a
+    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582:582 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581 -> a
-    5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):261:290 -> a
-    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):945:957 -> a
-    35:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):291 -> a
-    48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292:329 -> a
-    86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):792:799 -> a
-    86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582 -> a
+    5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
+    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):955:967 -> a
+    35:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292 -> a
+    48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293:330 -> a
+    86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):793:800 -> a
+    86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799 -> a
-    94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799:806 -> a
-    95:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800 -> a
+    94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
+    95:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     103:103:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):806 -> a
-    103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
+    103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799 -> a
-    104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):811:811 -> a
-    105:105:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):839:840 -> a
-    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800 -> a
+    104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):812:812 -> a
+    105:105:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840:841 -> a
+    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840 -> a
-    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841:848 -> a
-    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841 -> a
+    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):842:849 -> a
+    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840 -> a
-    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    118:129:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):818:829 -> a
-    118:129:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):339:342 -> a
-    134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):279:281 -> a
-    137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369:369 -> a
+    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841 -> a
+    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    118:129:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:830 -> a
+    118:129:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340:343 -> a
+    134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:282 -> a
+    137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
     138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369 -> a
-    139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369:369 -> a
+    138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
     140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369 -> a
-    141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):408:414 -> a
-    141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
+    141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):414 -> a
-    148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415:420 -> a
-    149:154:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    155:159:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):424:428 -> a
-    155:159:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):372 -> a
-    160:180:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):375:395 -> a
-    181:184:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):433:436 -> a
-    181:184:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):398 -> a
-    185:185:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399:399 -> a
-    186:231:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):459:504 -> a
-    186:231:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400 -> a
-    232:248:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):510:526 -> a
-    232:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
-    249:264:void removeFieldWrites():555:570 -> a
-    249:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    265:267:void removeFieldWrites():564:566 -> a
-    265:267:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    268:270:void removeFieldWrites():557:559 -> a
-    268:270:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    271:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403:403 -> a
-    272:276:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):534:538 -> a
-    277:288:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):537:548 -> a
-    289:289:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    289:289:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548 -> a
-    290:290:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:549 -> a
+    148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
+    148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
+    149:154:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    155:159:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):425:429 -> a
+    155:159:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):373 -> a
+    160:180:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):376:396 -> a
+    181:184:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):434:437 -> a
+    181:184:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399 -> a
+    185:185:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400:400 -> a
+    186:231:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:505 -> a
+    186:231:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    232:248:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):511:527 -> a
+    232:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    249:264:void removeFieldWrites():556:571 -> a
+    249:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    265:267:void removeFieldWrites():565:567 -> a
+    265:267:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    268:270:void removeFieldWrites():558:560 -> a
+    268:270:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    271:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    272:276:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):535:539 -> a
+    277:288:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):538:549 -> a
+    289:289:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    289:289:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
+    290:290:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550:550 -> a
     291:291:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    291:291:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
-    292:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548:551 -> a
-    296:296:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):538:538 -> a
-    297:302:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):576:581 -> a
-    303:355:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):580:632 -> a
-    356:386:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):647:677 -> a
-    356:386:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):695 -> a
-    387:389:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):686:688 -> a
-    390:396:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:693 -> a
-    397:397:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):691:691 -> a
-    398:400:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):699:701 -> a
-    401:401:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):702:702 -> a
-    402:438:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):712:748 -> a
-    439:444:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):752:757 -> a
+    291:291:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550 -> a
+    292:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:552 -> a
+    296:296:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):539:539 -> a
+    297:302:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):577:582 -> a
+    303:355:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):581:633 -> a
+    356:386:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):648:678 -> a
+    356:386:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):696 -> a
+    387:389:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:689 -> a
+    390:396:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):688:694 -> a
+    397:397:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):692:692 -> a
+    398:400:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):700:702 -> a
+    401:401:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703:703 -> a
+    402:438:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):713:749 -> a
+    439:444:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):753:758 -> a
     445:445:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    445:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757 -> a
-    446:446:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757:757 -> a
+    445:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758 -> a
+    446:446:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758:758 -> a
     447:447:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    447:447:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757 -> a
-    448:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):761:764 -> a
-    452:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):861:891 -> a
-    483:488:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):913:918 -> a
-    483:488:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):892 -> a
-    489:506:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):887:904 -> a
-    507:507:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):903:903 -> a
-    508:520:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):964:976 -> a
-    521:521:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):990:990 -> a
-    522:523:void removeInstruction(com.android.tools.r8.ir.code.Instruction):990:991 -> a
-    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():147:249 -> b
-    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():233:233 -> b
+    447:447:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758 -> a
+    448:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):762:765 -> a
+    452:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):862:892 -> a
+    483:488:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):923:928 -> a
+    483:488:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):893 -> a
+    489:515:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):888:914 -> a
+    516:516:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):909:909 -> a
+    517:530:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):974:987 -> a
+    531:531:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):986:986 -> a
+    532:532:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1001:1001 -> a
+    533:534:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1001:1002 -> a
+    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
+    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
     105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
-    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688 -> b
-    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688:688 -> b
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689 -> b
+    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689:689 -> b
     107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
-    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688 -> b
-    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):922:935 -> b
-    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
+    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689 -> b
+    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):932:945 -> b
+    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
     122:122:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):935 -> b
-    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
-    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):940:940 -> b
-    1:22:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():110:131 -> c
-    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():441:453 -> d
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.a:
+    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):945 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
+    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):950:950 -> b
+    1:22:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():111:132 -> c
+    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():442:454 -> d
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.a:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo asMutableCallSiteOptimizationInfo() -> a
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int) -> a
     boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod) -> a
     boolean isDefaultCallSiteOptimizationInfo() -> b
     boolean isMutableCallSiteOptimizationInfo() -> c
-com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.b:
+com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int) -> a
     boolean isDefaultCallSiteOptimizationInfo() -> b
     1:1:com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo getInstance():16:16 -> d
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.M0.c:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.H0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -37760,7 +37920,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():21:21 -> g
     boolean valueHasBeenPropagated() -> h
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():16:16 -> i
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.M0.d:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.H0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
     boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> k
@@ -37824,7 +37984,7 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     1:1:boolean mayHaveSideEffects():201:201 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():77:77 -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.M0.e:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.H0.e:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -37834,7 +37994,7 @@
     boolean isMutableFieldOptimizationInfo() -> f
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> g
     boolean valueHasBeenPropagated() -> h
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.M0.g:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.H0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
     java.util.Set getInitializedClassesOnNormalExit() -> C
@@ -37868,13 +38028,13 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     boolean mayHaveSideEffects() -> y
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.M0.f:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.H0.f:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
     1:3:void <clinit>():20:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.k:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.k:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
     boolean $assertionsDisabled -> d
@@ -37908,8 +38068,8 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection lambda$computeCachedRepresentativeIfNecessary$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection,com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection):125:125 -> b
     boolean isMutableCallSiteOptimizationInfo() -> c
     1:11:java.lang.String toString():227:237 -> toString
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.M0.h:
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.M0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.H0.h:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.H0.j:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement[] dynamicTypes -> a
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection BOTTOM -> b
     boolean $assertionsDisabled -> c
@@ -37927,11 +38087,11 @@
     9:9:boolean equals(java.lang.Object):94:94 -> equals
     1:1:int hashCode():101:101 -> hashCode
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.M0.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.H0.i:
     1:1:void <init>():35:35 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int):38:38 -> a
     1:1:int hashCode():43:43 -> hashCode
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.M0.l:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.H0.l:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
@@ -37955,7 +38115,7 @@
     1:1:boolean valueHasBeenPropagated():71:71 -> h
     1:1:void markAsPropagated():75:75 -> i
     1:1:void markCannotBeKept():57:57 -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.M0.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.H0.n:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -37995,10 +38155,10 @@
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.M0.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.H0.m:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.M0.o:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.H0.o:
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
@@ -38040,7 +38200,7 @@
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> i
     1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> j
     1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):47:52 -> k
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.M0.q:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.H0.q:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38073,9 +38233,9 @@
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.M0.p:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.H0.p:
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.M0.r:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.H0.r:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38110,7 +38270,7 @@
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> j
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.M0.u:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.H0.u:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -38118,7 +38278,7 @@
     6:6:void <init>(java.util.List):34:34 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):35:35 -> a
     2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):39:40 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.M0.s:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.H0.s:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -38128,7 +38288,7 @@
     boolean hasFieldAssignment -> d
     1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):72:81 -> <init>
     1:1:boolean notUsed():85:85 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.M0.t:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.H0.t:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -38162,7 +38322,7 @@
     32:33:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
     32:33:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
     34:34:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.M0.v:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.H0.v:
     boolean returnsConstantNumber -> i
     boolean returnsConstantString -> k
     boolean initializerEnablingJavaAssertions -> u
@@ -38255,7 +38415,56 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     1:1:boolean mayHaveSideEffects():289:289 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():161:161 -> z
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.N0.a:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.a:
+    com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():19:19 -> e
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.b:
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):20:24 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):29:43 -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.I0.c:
+    com.android.tools.r8.graph.DexEncodedMethod callee -> a
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    java.io.PrintStream output -> c
+    boolean reasonHasBeenReported -> d
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:22 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):19:25 -> <init>
+    1:11:void print(java.lang.String):29:39 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):44:44 -> a
+    13:13:void reportInstructionBudgetIsExceeded():49:49 -> a
+    14:14:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):55:55 -> a
+    15:19:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:79 -> a
+    20:20:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:75 -> a
+    21:23:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:87 -> a
+    24:24:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:85 -> a
+    25:25:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    1:1:void reportUnknownReason():65:65 -> b
+    2:2:void reportWillExceedInstructionBudget(int,int):98:98 -> b
+    1:1:void reportUnknownTarget():70:70 -> c
+    1:1:boolean verifyReasonHasBeenReported():107:107 -> d
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.J0.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
@@ -38276,7 +38485,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.D.e.N0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.J0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
@@ -38320,7 +38529,7 @@
     81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
     81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
     1:5:void processCode():172:176 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.N0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.J0.b:
     1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
@@ -38332,7 +38541,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.D.e.N0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.D.e.J0.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
@@ -38343,7 +38552,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.D.e.N0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.D.e.J0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -38368,7 +38577,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -38381,14 +38590,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):139:140 -> e
     1:1:boolean isTrivial():130:130 -> f
     1:1:int size():72:72 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.N0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.J0.e:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):56:58 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.N0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.J0.f:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):218:219 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.N0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -38408,9 +38617,9 @@
     22:22:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
     23:23:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> k
     23:23:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.N0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.J0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.N0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.J0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -38423,114 +38632,111 @@
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
     java.util.function.BiFunction strategyFactory -> i
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):124:124 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):90:132 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> a
-    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):147:147 -> a
-    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):160:193 -> a
-    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):161:161 -> a
-    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):168:168 -> a
-    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:205 -> a
-    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):216:225 -> a
-    52:72:java.util.Map finalizeLambdaGroups():314:334 -> a
-    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):229 -> a
-    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):232:265 -> a
-    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):264:278 -> a
-    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):233:233 -> a
-    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
-    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):267:267 -> a
-    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):269:271 -> a
-    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):283:287 -> a
-    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):291:310 -> a
-    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):296:296 -> a
-    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):298:303 -> a
-    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):301:306 -> a
-    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> a
-    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):306 -> a
-    168:174:void removeTrivialLambdaGroups():340:346 -> a
-    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):354:364 -> a
-    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):363:376 -> a
-    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:370 -> a
-    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:372 -> a
-    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380:381 -> a
-    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    52:72:java.util.Map finalizeLambdaGroups():313:333 -> a
+    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    168:174:void removeTrivialLambdaGroups():339:345 -> a
+    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     214:215:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):382:404 -> a
-    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     239:239:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:410 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):87 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> b
-    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):164:166 -> b
+    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408:409 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166 -> b
-    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166:167 -> b
-    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):172:184 -> b
-    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):179:179 -> b
-    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):193:193 -> b
-    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):346:346 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):359:359 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> c
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):143:143 -> c
-    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):151:151 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> d
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):134:134 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.N0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.N0.k:
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> c
+    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> d
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.J0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.J0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):413:413 -> <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):414:418 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415:415 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):417:417 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):425:425 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):430:430 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):435:435 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):440:440 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):445:445 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):450:450 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.N0.l:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.J0.l:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
     java.util.Set typeAffectedValues -> m
-    1:1:void <clinit>():454:454 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):454:454 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):465:467 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:464 -> <init>
-    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):458:470 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):466:466 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):474:476 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):538:538 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):543:543 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):550:550 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):555:555 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):562:562 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):567:567 -> a
-    1:28:void processCode():483:510 -> b
-    29:48:void processCode():509:528 -> b
-    49:49:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> b
-    49:49:void processCode():528 -> b
-    50:51:void processCode():528:529 -> b
-    52:52:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):533:533 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.N0.m:
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.J0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():571:571 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):576:577 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):594:598 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):604:610 -> a
-    1:1:java.lang.Object apply(java.lang.Object):571:571 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):582:586 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):571 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.N0.o:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.J0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -38568,7 +38774,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -38581,35 +38787,35 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> c
     1:3:void prepareInstructions():35:37 -> h
     4:35:void prepareInstructions():36:67 -> h
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.N0.p.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.N0.p.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.N0.p.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.N0.p.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.N0.p.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38656,29 +38862,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.N0.p.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.N0.p.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.N0.p.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.N0.p.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.N0.p.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -38687,7 +38893,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38741,7 +38947,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -38750,96 +38956,96 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> b
     1:17:void prepareInstructions():32:48 -> h
     void prepareSuperConstructorCall(int) -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.N0.p.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.J0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):57:60 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):59:62 -> <init>
     int getInstanceInitializerSize(java.util.List) -> a
     int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int) -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):65:65 -> a
-    1:1:void accept(java.lang.Object):45:45 -> accept
-    2:2:void accept(com.android.tools.r8.graph.DexClass):70:70 -> accept
-    2:2:void accept(java.lang.Object):45 -> accept
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):67:67 -> a
+    1:1:void accept(java.lang.Object):47:47 -> accept
+    2:2:void accept(com.android.tools.r8.graph.DexClass):72:72 -> accept
+    2:2:void accept(java.lang.Object):47 -> accept
     3:3:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> accept
-    3:3:void accept(com.android.tools.r8.graph.DexClass):70 -> accept
-    3:3:void accept(java.lang.Object):45 -> accept
-    4:22:void accept(com.android.tools.r8.graph.DexClass):70:88 -> accept
-    4:22:void accept(java.lang.Object):45 -> accept
-    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):220:231 -> accept
-    23:34:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    23:34:void accept(java.lang.Object):45 -> accept
-    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):250:252 -> accept
-    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):231 -> accept
-    35:37:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    35:37:void accept(java.lang.Object):45 -> accept
-    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):234:235 -> accept
-    38:39:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    38:39:void accept(java.lang.Object):45 -> accept
-    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):244:244 -> accept
-    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):235 -> accept
-    40:40:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    40:40:void accept(java.lang.Object):45 -> accept
-    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):238:239 -> accept
-    41:42:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    41:42:void accept(java.lang.Object):45 -> accept
-    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236:236 -> accept
-    43:43:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    43:43:void accept(java.lang.Object):45 -> accept
-    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
-    44:44:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    44:44:void accept(java.lang.Object):45 -> accept
-    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):227:227 -> accept
-    45:45:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    45:45:void accept(java.lang.Object):45 -> accept
-    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):223:223 -> accept
-    46:46:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    46:46:void accept(java.lang.Object):45 -> accept
-    47:47:void accept(com.android.tools.r8.graph.DexClass):86:86 -> accept
-    47:47:void accept(java.lang.Object):45 -> accept
-    48:61:void accept(com.android.tools.r8.graph.DexClass):83:96 -> accept
-    48:61:void accept(java.lang.Object):45 -> accept
-    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):129:133 -> accept
-    62:66:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    62:66:void accept(java.lang.Object):45 -> accept
-    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):149:211 -> accept
-    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    67:129:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    67:129:void accept(java.lang.Object):45 -> accept
-    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):152:206 -> accept
-    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    130:184:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    130:184:void accept(java.lang.Object):45 -> accept
-    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int) -> accept
-    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    185:197:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    185:197:void accept(java.lang.Object):45 -> accept
-    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):176:179 -> accept
-    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    198:201:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    198:201:void accept(java.lang.Object):45 -> accept
-    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):160:163 -> accept
-    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    202:205:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    202:205:void accept(java.lang.Object):45 -> accept
-    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):142:143 -> accept
-    206:207:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    206:207:void accept(java.lang.Object):45 -> accept
-    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:134 -> accept
-    208:208:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    208:208:void accept(java.lang.Object):45 -> accept
-    209:228:void accept(com.android.tools.r8.graph.DexClass):94:113 -> accept
-    209:228:void accept(java.lang.Object):45 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> accept
-    229:229:void accept(com.android.tools.r8.graph.DexClass):112 -> accept
-    229:229:void accept(java.lang.Object):45 -> accept
-    230:232:void accept(com.android.tools.r8.graph.DexClass):114:116 -> accept
-    230:232:void accept(java.lang.Object):45 -> accept
-    233:233:void accept(com.android.tools.r8.graph.DexClass):71:71 -> accept
-    233:233:void accept(java.lang.Object):45 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.N0.p.r:
+    3:3:void accept(com.android.tools.r8.graph.DexClass):72 -> accept
+    3:3:void accept(java.lang.Object):47 -> accept
+    4:22:void accept(com.android.tools.r8.graph.DexClass):72:90 -> accept
+    4:22:void accept(java.lang.Object):47 -> accept
+    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):225:236 -> accept
+    23:34:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    23:34:void accept(java.lang.Object):47 -> accept
+    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):255:257 -> accept
+    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236 -> accept
+    35:37:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    35:37:void accept(java.lang.Object):47 -> accept
+    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):239:240 -> accept
+    38:39:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    38:39:void accept(java.lang.Object):47 -> accept
+    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):249:249 -> accept
+    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):240 -> accept
+    40:40:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    40:40:void accept(java.lang.Object):47 -> accept
+    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):243:244 -> accept
+    41:42:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    41:42:void accept(java.lang.Object):47 -> accept
+    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):241:241 -> accept
+    43:43:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    43:43:void accept(java.lang.Object):47 -> accept
+    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):237:237 -> accept
+    44:44:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    44:44:void accept(java.lang.Object):47 -> accept
+    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
+    45:45:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    45:45:void accept(java.lang.Object):47 -> accept
+    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):228:228 -> accept
+    46:46:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    46:46:void accept(java.lang.Object):47 -> accept
+    47:47:void accept(com.android.tools.r8.graph.DexClass):88:88 -> accept
+    47:47:void accept(java.lang.Object):47 -> accept
+    48:61:void accept(com.android.tools.r8.graph.DexClass):85:98 -> accept
+    48:61:void accept(java.lang.Object):47 -> accept
+    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:138 -> accept
+    62:66:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    62:66:void accept(java.lang.Object):47 -> accept
+    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):154:216 -> accept
+    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    67:129:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    67:129:void accept(java.lang.Object):47 -> accept
+    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):157:211 -> accept
+    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    130:184:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    130:184:void accept(java.lang.Object):47 -> accept
+    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):190:202 -> accept
+    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    185:197:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    185:197:void accept(java.lang.Object):47 -> accept
+    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):181:184 -> accept
+    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    198:201:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    198:201:void accept(java.lang.Object):47 -> accept
+    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):165:168 -> accept
+    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    202:205:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    202:205:void accept(java.lang.Object):47 -> accept
+    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):147:148 -> accept
+    206:207:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    206:207:void accept(java.lang.Object):47 -> accept
+    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139:139 -> accept
+    208:208:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    208:208:void accept(java.lang.Object):47 -> accept
+    209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
+    209:228:void accept(java.lang.Object):47 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> accept
+    229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
+    229:229:void accept(java.lang.Object):47 -> accept
+    230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
+    230:234:void accept(java.lang.Object):47 -> accept
+    235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
+    235:235:void accept(java.lang.Object):47 -> accept
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.J0.p.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -38852,7 +39058,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.N0.p.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.J0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -38870,7 +39076,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -38879,7 +39085,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -38890,7 +39096,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> j
     1:1:boolean isStateless():31 -> j
     2:2:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.N0.p.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -38920,7 +39126,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.N0.p.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.J0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -38932,13 +39138,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -38992,13 +39198,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39007,7 +39213,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.N0.p.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.J0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39030,7 +39236,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39123,7 +39329,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.N0.p.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.J0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -39139,7 +39345,7 @@
     1:1:void lambda$prepareInstructions$6(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> e
     1:1:void lambda$prepareInstructions$7(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> f
     1:65:void prepareInstructions():41:105 -> h
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.O0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.K0.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
@@ -39153,10 +39359,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.D.e.O0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.D.e.K0.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.D.e.O0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39167,7 +39373,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.D.e.O0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39176,10 +39382,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.D.e.O0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.D.e.K0.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.D.e.O0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39200,12 +39406,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.D.e.O0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.D.e.K0.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.D.e.O0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.D.e.K0.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
@@ -39217,7 +39423,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.D.e.O0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.D.e.K0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -39232,7 +39438,7 @@
     1:1:java.lang.Boolean lambda$test$3(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.O0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.K0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39244,14 +39450,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.D.e.O0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.D.e.K0.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.D.e.O0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.D.e.K0.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
@@ -39263,7 +39469,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.D.e.O0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39277,7 +39483,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.D.e.O0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.D.e.K0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39289,7 +39495,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.D.e.P0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.D.e.L0.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -39297,81 +39503,90 @@
     java.util.function.BiConsumer fixupStrategy -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():47:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
-    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:109 -> <init>
-    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:182 -> a
-    68:78:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):127:137 -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):108:108 -> <init>
+    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):59:111 -> <init>
+    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):118:184 -> a
+    68:78:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):129:139 -> a
     79:79:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    79:79:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    80:99:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):142:161 -> a
-    100:104:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):167:171 -> a
-    105:106:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):186:187 -> a
-    105:106:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
+    79:79:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
+    80:99:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:163 -> a
+    100:104:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):169:173 -> a
+    105:106:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):188:189 -> a
+    105:106:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
     107:107:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    107:107:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):190 -> a
-    107:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    108:109:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):190:191 -> a
-    108:109:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:176 -> a
-    114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:239 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244 -> a
-    136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244:253 -> a
-    146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:347 -> a
-    146:154:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    155:155:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    155:155:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):350 -> a
-    155:155:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    156:196:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):353:393 -> a
-    156:196:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    197:197:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):421:421 -> a
-    197:197:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
-    197:197:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    198:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:401 -> a
-    198:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    204:227:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):426:449 -> a
-    204:227:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):401 -> a
-    204:227:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    228:235:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):402:409 -> a
-    228:235:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    236:243:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):454:461 -> a
-    236:243:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):409 -> a
-    236:243:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    244:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):410:414 -> a
-    244:248:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    249:250:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:261 -> a
-    251:255:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):329:333 -> a
-    251:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    256:280:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:286 -> a
-    281:293:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    281:293:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    294:326:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288:320 -> a
-    327:360:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    361:362:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):541:542 -> a
-    363:366:void setFixupStrategy(java.util.function.BiConsumer):553:556 -> a
-    367:370:void cleanFixupStrategy():560:563 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.P0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.P0.b:
+    107:107:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):192 -> a
+    107:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
+    108:109:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):192:193 -> a
+    108:109:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
+    110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
+    114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
+    128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
+    136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
+    146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):341:349 -> a
+    146:154:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    155:155:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    155:155:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):352 -> a
+    155:155:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    156:196:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):355:395 -> a
+    156:196:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    197:197:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):423:423 -> a
+    197:197:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):395 -> a
+    197:197:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    198:211:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):398:411 -> a
+    198:211:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    212:219:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):458:465 -> a
+    212:219:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):411 -> a
+    212:219:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    220:224:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):412:416 -> a
+    220:224:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    225:226:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:263 -> a
+    227:231:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331:335 -> a
+    227:231:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):263 -> a
+    232:256:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264:288 -> a
+    257:269:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):472:484 -> a
+    257:269:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288 -> a
+    270:302:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):290:322 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
+    304:322:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):428:446 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    323:323:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
+    324:324:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):447:447 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    325:325:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
+    326:327:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):452:453 -> a
+    328:328:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:491 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    329:329:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491 -> a
+    330:375:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:536 -> a
+    376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
+    378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
+    382:385:void cleanFixupStrategy():578:581 -> a
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
+    2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.L0.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):566:566 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> a
-    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> b
-    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> c
-    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> c
-    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> c
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> d
-    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> d
-    1:2:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> e
-    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> e
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> f
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.P0.c:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):584:584 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):586:587 -> <init>
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):609:609 -> a
+    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):634:634 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):619:619 -> b
+    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):614:614 -> c
+    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):639:639 -> c
+    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):644:644 -> c
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):624:624 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):649:649 -> d
+    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):654:656 -> d
+    1:2:boolean registerField(com.android.tools.r8.graph.DexField):597:598 -> e
+    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):604:604 -> e
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):591:592 -> f
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.L0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -39381,24 +39596,24 @@
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.Set referencedFrom -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):65:80 -> <init>
-    1:1:com.android.tools.r8.graph.DexType hostType():88:88 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():98:98 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.D.e.P0.d:
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
+    1:1:com.android.tools.r8.graph.DexType hostType():90:90 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.D.e.L0.d:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Fixup -> c
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Examine -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase None -> a
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.P0.f:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):55:55 -> <init>
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.L0.f:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):33:35 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.P0.g:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.L0.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     boolean $assertionsDisabled -> i
@@ -39414,7 +39629,7 @@
     1:1:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):77:77 -> a
     2:5:void prepareCandidates():213:216 -> a
     2:5:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    6:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():92:93 -> a
+    6:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:95 -> a
     6:7:void prepareCandidates():218 -> a
     6:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     8:11:void prepareCandidates():219:222 -> a
@@ -39424,7 +39639,7 @@
     12:12:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     13:15:void prepareCandidates():225:227 -> a
     13:15:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    16:16:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    16:16:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     16:16:void prepareCandidates():228 -> a
     16:16:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     17:23:void prepareCandidates():228:234 -> a
@@ -39436,35 +39651,35 @@
     25:25:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     26:27:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:84 -> a
     28:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:87 -> a
-    33:41:java.util.Set staticizeMethodSymbols():561:569 -> a
+    33:41:java.util.Set staticizeMethodSymbols():566:574 -> a
     33:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     42:42:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    42:42:java.util.Set staticizeMethodSymbols():570 -> a
+    42:42:java.util.Set staticizeMethodSymbols():575 -> a
     42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    43:45:java.util.Set staticizeMethodSymbols():570:572 -> a
+    43:45:java.util.Set staticizeMethodSymbols():575:577 -> a
     43:45:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    46:46:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    46:46:java.util.Set staticizeMethodSymbols():573 -> a
+    46:46:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    46:46:java.util.Set staticizeMethodSymbols():578 -> a
     46:46:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    47:62:java.util.Set staticizeMethodSymbols():573:588 -> a
+    47:62:java.util.Set staticizeMethodSymbols():578:593 -> a
     47:62:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    63:101: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):615:653 -> a
-    63:101:java.util.Set staticizeMethodSymbols():590 -> a
+    63:101: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):620:658 -> a
+    63:101:java.util.Set staticizeMethodSymbols():595 -> a
     63:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    102:102:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    102:102: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):655 -> a
-    102:102:java.util.Set staticizeMethodSymbols():590 -> a
+    102:102:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    102:102: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 -> a
+    102:102:java.util.Set staticizeMethodSymbols():595 -> a
     102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    103:103: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):655:655 -> a
-    103:103:java.util.Set staticizeMethodSymbols():590 -> a
+    103:103: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:660 -> a
+    103:103:java.util.Set staticizeMethodSymbols():595 -> a
     103:103:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    104: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):654:666 -> a
-    104:116:java.util.Set staticizeMethodSymbols():590 -> a
+    104: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):659:671 -> a
+    104:116:java.util.Set staticizeMethodSymbols():595 -> a
     104:116:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     117:117:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    117:117:java.util.Set staticizeMethodSymbols():570 -> a
+    117:117:java.util.Set staticizeMethodSymbols():575 -> a
     117:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    118:119:java.util.Set staticizeMethodSymbols():596:597 -> a
+    118:119:java.util.Set staticizeMethodSymbols():601:602 -> a
     118:119:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     120:122:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):95:97 -> a
     123:164:void finalEligibilityCheck():101:142 -> a
@@ -39474,15 +39689,15 @@
     169:169:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
     169:169:void finalEligibilityCheck():155 -> a
     170:171:void finalEligibilityCheck():155:156 -> a
-    172:172:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    172:172:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -39492,7 +39707,7 @@
     242:246:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:266 -> a
     247:247:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:262 -> a
     248:260:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277:289 -> a
-    261:261:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    261:261:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     261:261:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
     262:267:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289:294 -> a
     268:268:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
@@ -39504,73 +39719,88 @@
     272:279:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):318:325 -> a
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
-    281:300:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:356 -> a
-    301:305:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):363:367 -> a
-    306:323:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):366:383 -> a
-    324:346:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):422:444 -> a
-    347:352:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):452:457 -> a
-    353:370:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):456:473 -> a
-    371:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):477:483 -> a
-    378:378:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    378:378:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):483 -> a
-    379:386:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):484:491 -> a
-    387:387:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    387:387:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):490 -> a
-    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):549:549 -> a
-    389:389:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    389:389:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551 -> a
-    390:392:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551:553 -> a
-    393:393:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    393:393:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555 -> a
-    394:394:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555:555 -> a
-    395:395:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603:603 -> a
-    396:396:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    396:396:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603 -> a
-    397:399:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603:605 -> a
-    400:400:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    400:400:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):606 -> a
-    401:401:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):606:606 -> a
-    402:402:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):605:605 -> a
-    403:403:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):606:606 -> a
-    404:404: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):671:671 -> a
-    405:405:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    405:405: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):672 -> a
-    406:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):673:674 -> a
-    408:408: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):672:672 -> a
+    281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
+    288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
+    291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
+    297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
+    299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
+    304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
+    322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
+    329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
+    337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
+    343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
+    349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
+    367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
+    378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
+    386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    386:386:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):495 -> a
+    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):554:554 -> a
+    388:388:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556 -> a
+    389:391:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556:558 -> a
+    392:392:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    392:392:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560 -> a
+    393:393:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560:560 -> a
+    394:394:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608:608 -> a
+    395:395:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    395:395:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608 -> a
+    396:398:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608:610 -> a
+    399:399:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    399:399:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):611 -> a
+    400:400:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):611:611 -> a
+    401:401:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):610:610 -> a
+    402:402:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    403:403: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):676:676 -> a
+    404:404:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    404:404:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677 -> a
+    405:406:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):678:679 -> a
+    407:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
-    23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):497 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):498:511 -> c
+    24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
     24:37:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     38:38:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    38:38:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):510 -> c
+    38:38:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):515 -> c
     38:38:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    39:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):512:512 -> c
+    39:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):517:517 -> c
     39:39:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):509:509 -> c
+    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):514:514 -> c
     40:40:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):507:530 -> c
+    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):512:535 -> c
     41:64:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    65:65:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> c
-    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532 -> c
+    65:65:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> c
+    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537 -> c
     65:65:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532:539 -> c
+    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:544 -> c
     66:73:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     74:74:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    74:74:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):538 -> c
+    74:74:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):543 -> c
     74:74:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    75:75:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):540:540 -> c
+    75:75:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):545:545 -> c
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:541 -> c
+    76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.Q0.a:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.Q0.g:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.a:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.M0.g:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int numberOfBuildersSimplified -> n
     int numberOfBuildersWithNonDeterministicArg -> l
@@ -39629,15 +39859,15 @@
     1:1:com.android.tools.r8.graph.DexItemFactory access$700(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> o
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$800(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$900(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> q
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.D.e.Q0.b:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.Q0.c:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.D.e.M0.b:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.M0.c:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState previous -> a
     java.util.Set nexts -> c
     java.lang.String addition -> b
     1:4:void <init>():963:966 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createRoot():970:970 -> a
     2:8:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createChild(java.lang.String):974:980 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.Q0.d:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.d:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():791:791 -> <clinit>
@@ -39649,7 +39879,7 @@
     21:21:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):842 -> a
     1:2:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):807:808 -> b
     1:2:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):849:850 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.Q0.e:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.M0.e:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
@@ -39677,7 +39907,7 @@
     66:66:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     67:67:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.Q0.f:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.M0.f:
     java.util.Map builderStates -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap builderToStringCounts -> b
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> f
@@ -39768,7 +39998,7 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
     240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39782,10 +40012,10 @@
     299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
-    302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
@@ -39802,7 +40032,7 @@
     380:383:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):712 -> a
     384:384:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):713:713 -> a
     385:391:void removeTrivialBuilders():728:734 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
     400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39811,7 +40041,7 @@
     403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
     413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39832,20 +40062,20 @@
     434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     449:449:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.Q0.i:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.M0.i:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -39867,7 +40097,7 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):132:135 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):136 -> a
     46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137:149 -> a
     59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39906,20 +40136,20 @@
     191:191:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):237 -> a
     192:193:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278:279 -> a
-    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     194:194:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279 -> a
     195:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279:279 -> a
     196:199:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):200:203 -> a
     200:200:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):217:217 -> a
     201:201:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):223:223 -> a
     202:205:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):286:289 -> a
-    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     206:206:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):291 -> a
     207:236:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:321 -> a
     237:237:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     237:237:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):321 -> a
     238:267:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):322:351 -> a
-    268:268:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    268:268:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     268:268:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):356 -> a
     269:310:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):357:398 -> a
     311:361:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):379:429 -> a
@@ -39935,7 +40165,7 @@
     377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     377:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):321 -> a
     378:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):443:444 -> a
-    380:380:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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):444 -> a
     381:384:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444:447 -> a
     385:390:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):473:478 -> a
@@ -39949,11 +40179,11 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):227:227 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):452:457 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):499:499 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):500 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):501:521 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:562 -> b
-    83:83:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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):562 -> b
     84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):562:562 -> b
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):209:209 -> c
@@ -39966,7 +40196,7 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):211:211 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):213:213 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):215:215 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.Q0.h:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.M0.h:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():569:569 -> <clinit>
     1:1:void <init>():572:572 -> <init>
@@ -40028,7 +40258,7 @@
     102:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     103:123:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
     103:123:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
-    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
@@ -40317,16 +40547,16 @@
     1354:1354:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2328 -> a
     1355:1362:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2329:2336 -> a
     1363:1398:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2444:2479 -> a
-    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1399:1399:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1400:1406:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -40454,10 +40684,10 @@
     117:117:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
     117:117:void allocateRegisters():224 -> c
     118:121:void allocateRegisters():224:227 -> c
-    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
     122:122:void allocateRegisters():227 -> c
     123:127:void allocateRegisters():228:232 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
     128:128:void allocateRegisters():227 -> c
     129:129:void allocateRegisters():236:236 -> c
     130:135:void clearState():531:536 -> c
@@ -40894,7 +41124,7 @@
     35:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):201:208 -> a
     43:45: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
     46:56:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):284:294 -> a
-    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     57:57:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     58:69:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     70:73:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -40948,42 +41178,64 @@
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> q
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.D.g.a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CfEmulateInterfaceSyntheticSourceCodeProvider -> com.android.tools.r8.D.g.c:
-    com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.method -> a
-    com.android.tools.r8.graph.AppView com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.appView -> c
-    com.android.tools.r8.graph.DexType interfaceType -> d
-    com.android.tools.r8.graph.DexMethod libraryMethod -> f
-    com.android.tools.r8.graph.DexMethod companionMethod -> e
-    java.util.List extraDispatchCases -> g
-    com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.originalMethod -> b
-    1:4:void com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.<init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:31 -> <init>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):44 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):45:48 -> <init>
-    1:40:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):53:92 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):50:50 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():68:68 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():0 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):55 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    42:42:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):56:56 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):37:43 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    51:54:void addReturn(java.util.List):104:107 -> a
-    1:2:void loadExtraParameters(java.util.List):98:99 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.D.g.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.D.g.h:
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45:45 -> a
+    1:1:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45 -> a
+    2:2:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):48:54 -> a
+    3:9:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.D.g.c:
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):286:287 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():292:300 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():298:298 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():295:307 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.D.g.d:
+    com.android.tools.r8.graph.DexString message -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):317:318 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():323:333 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():331:331 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():328:337 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.D.g.e:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):77:81 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():86:102 -> a
+    18:53:com.android.tools.r8.graph.CfCode generateCfCode():99:134 -> a
+    54:54:com.android.tools.r8.graph.CfCode generateCfCode():133:133 -> a
+    55:67:com.android.tools.r8.graph.CfCode generateCfCode():130:142 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.D.g.f:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):160:164 -> <init>
+    1:20:com.android.tools.r8.graph.CfCode generateCfCode():169:188 -> a
+    21:45:com.android.tools.r8.graph.CfCode generateCfCode():185:209 -> a
+    46:46:com.android.tools.r8.graph.CfCode generateCfCode():208:208 -> a
+    47:60:com.android.tools.r8.graph.CfCode generateCfCode():205:218 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.D.g.g:
+    com.android.tools.r8.graph.DexField wrapperField -> e
+    com.android.tools.r8.graph.DexType argType -> c
+    com.android.tools.r8.graph.DexField reverseWrapperField -> d
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):230:233 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():238:273 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():271:271 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():268:277 -> a
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.D.g.i:
+    java.util.List extraDispatchCases -> f
+    com.android.tools.r8.graph.DexType interfaceType -> c
+    com.android.tools.r8.graph.DexMethod libraryMethod -> e
+    com.android.tools.r8.graph.DexMethod companionMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):40:44 -> <init>
+    1:41:com.android.tools.r8.graph.CfCode generateCfCode():49:89 -> a
+    1:4:void addReturn(java.util.List):100:103 -> b
+    1:2:void loadExtraParameters(java.util.List):94:95 -> c
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.D.g.j:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -41004,7 +41256,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.D.g.f:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.D.g.l:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -41021,7 +41273,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> h
     1:27:boolean checkSignatures():146:172 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.D.g.e:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.D.g.k:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -41041,15 +41293,23 @@
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.D.g.g:
-    java.util.function.Consumer registryCallback -> c
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> b
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.D.g.m:
+    java.util.function.Consumer registryCallback -> d
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider,java.util.function.Consumer):20:22 -> <init>
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> p
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> q
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.D.g.h:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.D.g.n:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexType holder -> b
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
+    1:1:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):28:28 -> a
+    2:2:java.util.List defaultTryCatchs():46:46 -> a
+    2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
+    3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.D.g.o:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -45988,7 +46248,7 @@
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
     13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):98:102 -> a
     18:26:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46003,11 +46263,11 @@
     68:79:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):249:260 -> a
     68:79:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):151 -> a
     80:122:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):153:195 -> a
-    123:127:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
+    123:127:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -51414,6 +51674,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.G.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.G.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51430,6 +51691,7 @@
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.G.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.G.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51445,6 +51707,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.G.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.G.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.G.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51458,6 +51721,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.G.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.G.b.a.c.j:
@@ -52043,7 +52307,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -52216,12 +52480,12 @@
     13:15:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):98:100 -> a
     16:20:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96: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 com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    25:25:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     25:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
     26:26:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     26:26:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
     27:29:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:131 -> a
-    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
     31:31:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     31:31:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
@@ -52230,7 +52494,7 @@
     33:37:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135 -> a
     38:38:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135:135 -> a
     39:39:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139:139 -> a
-    40:40:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    40:40:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     40:40:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
     41:41:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     41:41:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
@@ -52242,7 +52506,7 @@
     54:58:void write(java.io.Writer):180:184 -> a
     59:59:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):182:182 -> a
     60:65:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):223:228 -> a
-    66:66:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    66:66:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     66:66:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):228 -> a
     67:69:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):228:230 -> a
     70:70:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):235:235 -> a
@@ -52317,7 +52581,7 @@
     72:78:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):186 -> a
     79:87:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):188:196 -> a
     88:103:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):237:252 -> a
-    104:104:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    104:104:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     104:104:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):317 -> a
     104:104:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):254 -> a
     105:121:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):317:333 -> a
@@ -52389,17 +52653,17 @@
     java.lang.String renamedName -> b
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35:35 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):124:130 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):96:96 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():134:134 -> a
-    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):147:148 -> a
-    3:4:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):140 -> a
-    5:6:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):155:156 -> a
-    5:6:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):141 -> a
-    1:11:boolean equals(java.lang.Object):223:233 -> equals
-    1:1:int hashCode():238:238 -> hashCode
+    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):122:128 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):94:94 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():132:132 -> a
+    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):145:146 -> a
+    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
+    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
-    2:2:int hashCode():238 -> hashCode
+    2:2:int hashCode():236 -> hashCode
 com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.K.m:
 com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.K.n:
     com.android.tools.r8.position.Position position -> c
@@ -52416,16 +52680,16 @@
     1:1:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:57 -> a
     2:2:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
     2:2:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58 -> a
-    3:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58:65 -> a
-    11:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):64:65 -> a
-    13:13:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
-    14:14:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    14:14:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68 -> a
-    15:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68:73 -> a
-    21:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):72:73 -> a
-    23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):71:71 -> a
-    24:24:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
-    25:25:com.android.tools.r8.naming.ClassNamingForMapApplier build():81:81 -> a
+    3:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58:64 -> a
+    10:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
+    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:62 -> a
+    12:12:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
+    12:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67 -> a
+    13:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67:71 -> a
+    18:18:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
+    19:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
+    20:20:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
+    21:21:com.android.tools.r8.naming.ClassNamingForMapApplier build():79:79 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.K.t:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
@@ -52582,10 +52846,10 @@
     84:84:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):77:77 -> a
     84:84:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):124 -> a
     85:86:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    87:88:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:266 -> a
+    87:88:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:272 -> a
     87:88:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     89:90:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
-    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:265 -> a
+    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:271 -> a
     91:91:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     92:96:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):143:147 -> a
     97:97:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
@@ -52816,7 +53080,7 @@
     229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
-    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
     259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
@@ -52836,7 +53100,7 @@
     322:322:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
     323:338:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):441:456 -> a
     1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):274:276 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
@@ -53001,10 +53265,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -53058,7 +53322,7 @@
     15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174 -> a
     16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175:191 -> a
     33:35:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):195:197 -> a
-    36:36:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    36:36:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     36:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):197 -> a
     37:62:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):197:222 -> a
     63:63:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):200:200 -> a
@@ -53074,7 +53338,7 @@
     94:97: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):285:288 -> a
     98:98:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):281:281 -> a
     99:113:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):297:311 -> a
-    114:114:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    114:114:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     114:114:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):311 -> a
     115:117:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):311:313 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> b
@@ -53292,7 +53556,7 @@
     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):150:166 -> a
     18:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):152:152 -> a
-    19:19:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    19:19:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     19:19: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 -> a
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     20:20: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 -> a
@@ -53387,7 +53651,7 @@
     2:31:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):30:59 -> <init>
     boolean hasPrefixRewritingLogic() -> a
     com.android.tools.r8.graph.DexItem lambda$getRenamedItems$2(com.android.tools.r8.graph.DexItem) -> a
-    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     1:1:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):54 -> a
     2:2:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):55:55 -> a
     3:3:com.android.tools.r8.naming.NamingLens createPrefixRewritingNamingLens(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):36:36 -> a
@@ -53404,7 +53668,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():308:308 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> 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
@@ -53444,7 +53708,7 @@
     8:15:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):275:282 -> a
     16:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
     16:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
     19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
     20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
@@ -53454,40 +53718,40 @@
     23:23:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:284 -> a
     24:28:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283:287 -> a
     29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:108 -> a
-    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
     49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
-    53:63:void computeDefaultInterfaceMethodMethods():319:329 -> a
+    53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
     53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:360 -> a
-    64:79:void computeDefaultInterfaceMethodMethods():329 -> a
+    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:359 -> a
+    64:79:void computeDefaultInterfaceMethodMethods():328 -> a
     64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     80:80:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    80:80:void computeDefaultInterfaceMethodMethods():329 -> a
+    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360 -> a
+    80:80:void computeDefaultInterfaceMethodMethods():328 -> a
     80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361:362 -> a
-    81:82:void computeDefaultInterfaceMethodMethods():329 -> a
+    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360:361 -> a
+    81:82:void computeDefaultInterfaceMethodMethods():328 -> a
     81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     83:84:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.toUnqualified():255:256 -> a
-    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    83:84:void computeDefaultInterfaceMethodMethods():329 -> a
+    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364 -> a
+    83:84:void computeDefaultInterfaceMethodMethods():328 -> a
     83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365:365 -> a
-    85:85:void computeDefaultInterfaceMethodMethods():329 -> a
+    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:364 -> a
+    85:85:void computeDefaultInterfaceMethodMethods():328 -> a
     85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:367 -> a
-    86:89:void computeDefaultInterfaceMethodMethods():329 -> a
+    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:366 -> a
+    86:89:void computeDefaultInterfaceMethodMethods():328 -> a
     86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     90:90:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368 -> a
-    90:90:void computeDefaultInterfaceMethodMethods():329 -> a
+    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367 -> a
+    90:90:void computeDefaultInterfaceMethodMethods():328 -> a
     90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368:368 -> a
-    91:91:void computeDefaultInterfaceMethodMethods():329 -> a
+    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
+    91:91:void computeDefaultInterfaceMethodMethods():328 -> a
     91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    92:92:void computeDefaultInterfaceMethodMethods():329 -> a
+    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    92:92:void computeDefaultInterfaceMethodMethods():328 -> a
     92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
     136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:113 -> a
@@ -53502,10 +53766,10 @@
     190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
     191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:220 -> a
     205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:240 -> a
-    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
     228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
     233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
     234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
@@ -53519,63 +53783,63 @@
     254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298 -> a
     255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298:299 -> a
     257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:307 -> a
-    261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312 -> a
-    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312:312 -> a
-    263:264:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:312 -> a
-    265:269:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
+    261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
+    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
     1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
     2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
     3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.K.m0:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <init>
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
-    3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389 -> a
-    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389:390 -> a
-    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:405 -> b
-    9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> b
-    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405 -> b
-    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):406:411 -> b
-    16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> b
-    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411 -> b
-    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411:415 -> b
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <init>
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):387:388 -> a
+    3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388 -> a
+    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:404 -> b
+    9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
+    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):404 -> b
+    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405:410 -> b
+    16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
+    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410 -> b
+    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.K.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):443:443 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):451:451 -> a
-    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):461:465 -> a
-    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):505:511 -> a
-    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):508:508 -> a
-    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470:471 -> a
-    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):471 -> a
-    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):471:472 -> a
-    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):477:477 -> a
-    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):482:482 -> a
-    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:488 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):460:464 -> a
+    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):469:470 -> a
+    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470 -> a
+    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470:471 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:487 -> a
     25:25:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):488 -> a
-    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):488:490 -> a
-    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490 -> a
-    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:492 -> a
+    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487 -> a
+    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:489 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):489 -> a
+    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490:491 -> a
     32:32:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):492 -> a
-    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):492:492 -> 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):443:443 -> 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):451:451 -> b
+    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491 -> a
+    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:491 -> a
+    1:1:com.android.tools.r8.graph.DexString lambda$next$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):442:442 -> b
+    2:2:com.android.tools.r8.graph.DexString lambda$next$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.K.q0:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -53806,28 +54070,28 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     com.android.tools.r8.utils.Reporter reporter -> b
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):36:36 -> <init>
-    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):88:95 -> <init>
-    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82:82 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:74 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):68:68 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):76:78 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74:78 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):138:138 -> a
-    14:14:java.util.Set getKeyset():142:142 -> a
-    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):146:146 -> a
-    1:7:void verifyMappingsAreConflictFree():99:105 -> b
+    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):87:94 -> <init>
+    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81:81 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):72:73 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):67:67 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75:77 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:77 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):136:136 -> a
+    14:14:java.util.Set getKeyset():140:140 -> a
+    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):144:144 -> a
+    1:6:void verifyMappingsAreConflictFree():98:103 -> b
+    7:7:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
+    7:7:void verifyMappingsAreConflictFree():105 -> b
     8:8:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
-    8:8:void verifyMappingsAreConflictFree():107 -> b
-    9:9:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
-    9:9:void verifyMappingsAreConflictFree():108 -> b
-    10:11:void verifyMappingsAreConflictFree():108:109 -> b
-    12:16:void verifyMappingsAreConflictFree():106:110 -> b
-    17:40:void verifyMappingsAreConflictFree():105:128 -> b
+    8:8:void verifyMappingsAreConflictFree():106 -> b
+    9:10:void verifyMappingsAreConflictFree():106:107 -> b
+    11:11:void verifyMappingsAreConflictFree():104:104 -> b
+    12:35:void verifyMappingsAreConflictFree():103:126 -> b
 com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.K.w0:
 com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.K.x0:
     java.util.Map map -> a
@@ -53837,9 +54101,9 @@
     3:7:void <init>(com.android.tools.r8.utils.Reporter):39:43 -> <init>
     1:4:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):49:52 -> a
     1:4:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    5:9:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:55 -> a
-    5:9:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    10:11:com.android.tools.r8.naming.SeedMapper build():62:63 -> a
+    5:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:54 -> a
+    5:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
+    9:10:com.android.tools.r8.naming.SeedMapper build():61:62 -> a
 com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.K.z0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -53905,7 +54169,7 @@
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:39:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):44:82 -> a
     40:41:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):68:69 -> a
-    42:42:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    42:42:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     42:42:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):69 -> a
     43:46:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):69:72 -> a
     47:47:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getUnqualifiedClassNameFromDescriptor(java.lang.String):218:218 -> a
@@ -54011,20 +54275,20 @@
     2:24:void run(java.lang.Iterable):47:69 -> a
     25:26:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):63:64 -> a
     27:28:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):71:72 -> a
-    29:58: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):88:117 -> a
-    59:64:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):122:127 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    65:65:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127 -> a
-    66:79:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127:140 -> a
-    80:80:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    80:80:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
-    81:81:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
-    82:82:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    82:82:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
-    83:83:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
-    84:84:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    84:84:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
-    85:85:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
+    29:67:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):89:127 -> a
+    68:73:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):132:137 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    74:74:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137 -> a
+    75:88:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137:150 -> a
+    89:89:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    89:89:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
+    90:90:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
+    91:91:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    91:91:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
+    92:92:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
+    93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    93:93:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
+    94:94:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
     1:1:com.android.tools.r8.utils.Reporter access$300(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> c
 com.android.tools.r8.naming.signature.GenericSignatureRewriter$1 -> com.android.tools.r8.K.B0.c:
@@ -54032,39 +54296,39 @@
     java.lang.StringBuilder renamedSignature -> a
     com.android.tools.r8.naming.signature.GenericSignatureRewriter this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):143:143 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):143:143 -> <init>
-    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143:143 -> a
-    2:2:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):174:174 -> a
-    2:2:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    3:3:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):175 -> a
-    3:3:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    4:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):176:181 -> a
-    4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):180:180 -> a
-    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):179 -> a
-    11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):184:186 -> a
-    12:14:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    15:30:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):185:200 -> a
-    15:30:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    31:40:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):197:206 -> a
-    31:40:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    41:41:java.lang.String getRenamedSignature():147:147 -> a
-    42:42:void parsedSymbol(char):152:152 -> a
-    43:43:void parsedIdentifier(java.lang.String):157:157 -> a
-    1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):162:162 -> b
-    1:1:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
-    2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):162 -> b
-    2:2:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):163:168 -> b
-    3:8:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    9:9:void start():213:213 -> b
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):153:153 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):153:153 -> <init>
+    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153:153 -> a
+    2:2:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):184:184 -> a
+    2:2:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    3:3:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):185 -> a
+    3:3:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    4:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):186:191 -> a
+    4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
+    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
+    11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
+    12:14:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    15:30:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):195:210 -> a
+    15:30:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    31:40:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):207:216 -> a
+    31:40:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    41:41:java.lang.String getRenamedSignature():157:157 -> a
+    42:42:void parsedSymbol(char):162:162 -> a
+    43:43:void parsedIdentifier(java.lang.String):167:167 -> a
+    1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
+    1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
+    2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
+    3:8:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    9:9:void start():223:223 -> b
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.L.a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
@@ -54077,7 +54341,7 @@
     2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -54130,7 +54394,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -54767,7 +55031,13 @@
     java.lang.String catchTypeDescriptor -> e
     1:6:void <init>(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int,java.lang.String):90:95 -> <init>
     7:8:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> <init>
-    1:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:148 -> a
+    1:17:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:139 -> a
+    18:19:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    18:19:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):139 -> a
+    20:24:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):143:147 -> a
+    25:26:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
+    27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
 com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.M.a.a.s:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
@@ -55749,12 +56019,12 @@
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:java.lang.String getDescription():53:53 -> getDescription
     1:1:java.lang.String getHolder():31:31 -> getHolder
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> getHolder
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> getHolder
     2:2:java.lang.String getHolder():31 -> getHolder
     1:1:java.lang.String getName():26:26 -> getName
     1:3:java.util.List getParameterTypes():41:43 -> getParameterTypes
     1:1:java.lang.String getReturnType():36:36 -> getReturnType
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> getReturnType
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> getReturnType
     2:2:java.lang.String getReturnType():36 -> getReturnType
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():48:48 -> toString
@@ -56110,7 +56380,7 @@
     24:39:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
     24:39:void processClass(com.android.tools.r8.graph.DexType):41 -> a
     40:43:void processClass(com.android.tools.r8.graph.DexType):43:46 -> a
-    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
@@ -56214,132 +56484,133 @@
     4:11:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):403:410 -> c
     4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259 -> c
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.d:
-    java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> y
-    java.util.SortedMap virtualInvokes -> z
-    java.util.Set prunedTypes -> T
-    boolean $assertionsDisabled -> X
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> w
-    java.util.IdentityHashMap indirectlyInstantiatedTypes -> q
-    java.util.Map enumValueInfoMaps -> V
-    java.util.SortedSet liveMethods -> v
-    java.util.SortedSet methodsTargetedByInvokeDynamic -> t
-    java.util.SortedSet targetedMethods -> r
-    java.util.Set instantiatedAppServices -> o
-    java.util.Map assumedValues -> J
-    java.util.Set neverClassInline -> P
-    java.util.Set neverPropagateValue -> R
-    java.util.SortedMap directInvokes -> C
-    java.util.Set forceInline -> L
-    java.util.Set liveTypes -> m
-    java.util.SortedMap interfaceInvokes -> A
-    java.util.Map mayHaveSideEffects -> H
-    java.util.Set keepConstantArguments -> N
-    java.util.Set instantiatedLambdas -> W
-    java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> x
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> S
-    java.util.Map switchMaps -> U
-    java.util.Set pinnedItems -> G
-    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> u
-    java.util.SortedSet bootstrapMethods -> s
-    java.util.Set callSites -> E
-    java.util.Map noSideEffects -> I
-    java.util.Set keepUnusedArguments -> O
-    java.util.Set instantiatedTypes -> p
-    java.util.SortedMap staticInvokes -> D
-    java.util.Set neverMerge -> Q
-    java.util.SortedMap superInvokes -> B
-    java.util.Set alwaysInline -> K
-    java.util.SortedSet brokenSuperInvokes -> F
-    java.util.Set neverInline -> M
-    java.util.Set instantiatedAnnotationTypes -> n
+    java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> y
+    java.util.Set neverPropagateValue -> T
+    java.util.Set prunedTypes -> V
+    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> v
+    java.util.Map enumValueInfoMaps -> X
+    java.util.SortedSet bootstrapMethods -> t
+    java.util.Set pinnedItems -> H
+    boolean $assertionsDisabled -> Z
+    java.util.Set callSites -> F
+    java.util.Set instantiatedAnnotationTypes -> o
+    java.util.Map noSideEffects -> J
+    java.util.Set keepConstantArguments -> P
+    java.util.Set instantiatedTypes -> q
+    java.util.SortedMap staticInvokes -> E
+    java.util.Set neverClassInline -> R
+    java.util.SortedMap superInvokes -> C
+    java.util.Set alwaysInline -> L
+    java.util.SortedMap virtualInvokes -> A
+    java.util.SortedSet brokenSuperInvokes -> G
+    java.util.Set neverInline -> N
+    java.util.Set instantiatedLambdas -> Y
+    java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> z
+    java.util.Set neverMerge -> S
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> x
+    java.util.IdentityHashMap indirectlyInstantiatedTypes -> r
+    java.util.Map switchMaps -> W
+    java.util.SortedSet liveMethods -> w
+    java.util.SortedSet methodsTargetedByInvokeDynamic -> u
+    java.util.SortedSet targetedMethods -> s
+    java.util.Map mayHaveSideEffects -> I
+    java.util.Set whyAreYouNotInlining -> O
+    java.util.Set instantiatedAppServices -> p
+    java.util.SortedMap directInvokes -> D
+    java.util.Map assumedValues -> K
+    java.util.Set keepUnusedArguments -> Q
+    java.util.SortedMap interfaceInvokes -> B
+    java.util.Set forceInline -> M
+    java.util.Set liveTypes -> n
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):224:224 -> <init>
-    2:190:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:262 -> <init>
-    191:191:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):303:303 -> <init>
-    192:459:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:341 -> <init>
-    460:498:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:391 -> <init>
-    499:542:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:396 -> <init>
-    543:543:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):401:401 -> <init>
-    544:923:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:453 -> <init>
-    924:940:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):449:465 -> <init>
-    941:956:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):461:476 -> <init>
-    957:963:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):472:478 -> <init>
-    964:964:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):485:485 -> <init>
-    965:1415:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:524 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):545:577 -> a
-    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):590:595 -> a
-    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:609 -> a
-    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:607 -> a
-    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):628:639 -> a
-    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):678:688 -> a
-    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):739:744 -> a
-    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):750:759 -> a
-    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):755:755 -> a
-    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
-    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996 -> a
-    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996:996 -> a
-    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):787:806 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996 -> a
-    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):997:1035 -> a
-    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
-    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):826:827 -> a
-    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):832:833 -> a
-    152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):852:867 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):865:865 -> a
-    169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):863:863 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1068:1069 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):861 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:876 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):859 -> a
-    174:183:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1051:1060 -> a
-    184:237: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):1077:1130 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:509:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    510:554:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    555:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    556:942:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    943:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    962:977:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    978:984:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    985:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    986:1446:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> a
+    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> a
+    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> a
+    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> a
+    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> a
+    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> a
+    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> a
+    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006:1006 -> a
+    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1007:1045 -> a
+    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
+    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
+    152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> a
+    169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1078:1079 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):885:886 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869 -> a
+    174:183:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1061:1070 -> a
+    184:237: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):1087:1140 -> a
     238:238:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    238:238: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):1129 -> a
-    239:266: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):1131:1158 -> a
-    267:269:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1169:1171 -> a
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):528:528 -> b
-    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):583:587 -> b
-    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):345:345 -> b
-    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):587 -> b
-    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):588:601 -> b
-    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):599:599 -> b
-    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):692:693 -> b
-    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):728:728 -> b
-    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> b
-    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):729 -> b
-    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):729:729 -> b
-    29:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):884:954 -> b
-    100: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):950:958 -> b
-    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):936:936 -> b
-    110:117:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):963:970 -> b
-    118:120:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1162:1164 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):618:619 -> c
-    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):697:708 -> c
-    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):722:723 -> d
+    238:238: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):1139 -> a
+    239:266: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):1141:1168 -> a
+    267:269:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1179:1181 -> a
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
+    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
+    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
+    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):597 -> b
+    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):598:611 -> b
+    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> b
+    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> b
+    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:738 -> b
+    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> b
+    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739 -> b
+    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739:739 -> b
+    29:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):894:964 -> b
+    100: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):960:968 -> b
+    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):946:946 -> b
+    110:117:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):973:980 -> b
+    118:120:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1172:1174 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
+    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
+    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
     3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> d
-    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):723 -> d
-    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):723:724 -> d
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):733:734 -> e
-    1:1:boolean hasLiveness():770:770 -> g
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):764:765 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():776:776 -> l
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):613:614 -> p
-    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():624:624 -> p
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):672:673 -> q
-    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):645:650 -> q
-    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):674 -> q
-    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):674:674 -> q
-    10:11:java.util.Set getPrunedTypes():846:847 -> q
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):654:668 -> r
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):532:533 -> s
-    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):528:528 -> s
-    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):533 -> s
-    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):537:541 -> t
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):841:842 -> u
+    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733 -> d
+    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733:734 -> d
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> e
+    1:1:boolean hasLiveness():780:780 -> g
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> l
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> p
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
+    3:4:java.util.Set getPrunedTypes():856:857 -> q
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
+    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
+    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
+    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
+    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
+    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):543 -> t
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> u
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> v
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):177:179 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.h:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> q
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
@@ -56418,7 +56689,7 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.B:
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
     com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> P
     java.util.Map annotationNodes -> s
     boolean $assertionsDisabled -> b0
@@ -56477,7 +56748,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):323:323 -> <init>
     2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):145:336 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1710 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:com.android.tools.r8.shaking.Enqueuer$GraphReporter access$000(com.android.tools.r8.shaking.Enqueuer):117:117 -> a
@@ -56506,7 +56777,7 @@
     72:76:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):451:455 -> a
     77:77:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
     77:77:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455 -> a
-    78:78:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):593:593 -> a
+    78:78:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):599:599 -> a
     78:78:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
     78:78:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455 -> a
     79:94:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:471 -> a
@@ -56516,347 +56787,344 @@
     103:104:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):544:545 -> a
     105:133:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):550:578 -> a
     134:134:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1055:1055 -> a
-    135:142:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1609:1616 -> a
-    135:142:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    143:149:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):3296:3302 -> a
-    143:149:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1616 -> a
-    143:149:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    150:150:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1613:1613 -> a
-    150:150:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    151:161:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062:1072 -> a
-    151:161:com.android.tools.r8.graph.DexMethod access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    162:177:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1110:1125 -> a
-    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1122:1122 -> a
-    179:183:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1137:1141 -> a
-    184:184:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    184:184:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1142 -> a
-    185:185:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145:1145 -> a
-    186:186:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
-    186:186:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145 -> a
-    187:187:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1147:1147 -> a
-    188:212:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1250 -> a
-    188:212:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1148 -> a
-    213:218:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1151:1156 -> a
-    219:222:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1216:1219 -> a
-    219:222:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    223:228:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):336:341 -> a
-    223:228:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1219 -> a
-    223:228:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    229:229:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1220:1220 -> a
-    229:229:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    230:238:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1179:1187 -> a
-    239:249:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):486:496 -> a
-    239:249:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    250:250:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    250:250:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497 -> a
-    250:250:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    251:251:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497:497 -> a
-    251:251:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    252:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1191:1203 -> a
-    265:265:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204 -> a
-    266:266:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204:1204 -> a
-    267:267:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
-    267:267:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
-    268:268:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    268:268:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
-    268:268:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
-    269:269:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1198:1198 -> a
-    270:273:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1208:1211 -> a
-    274:274:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1256:1256 -> a
-    275:275:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1260:1260 -> a
-    276:276:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
-    276:276:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1261 -> a
-    277:277:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
-    277:277:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2495 -> a
-    278:286:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1278 -> a
-    287:287:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
-    287:287:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1282 -> a
-    288:291:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1286 -> a
-    292:312:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1290:1310 -> a
-    292:312:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    313:314:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> a
-    313:314:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1311 -> a
-    313:314:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    315:315:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1312:1312 -> a
-    315:315:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    316:344:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1327:1355 -> a
-    345:369:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1360:1384 -> a
-    370:370:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
-    370:370:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    371:371:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    371:371:void reportMissingField(com.android.tools.r8.graph.DexField):1403 -> a
-    371:371:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    372:372:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
-    372:372:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    373:373:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443:1443 -> a
-    374:374:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    374:374:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443 -> a
-    375:383:void markLibraryAndClasspathMethodOverriddesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> a
-    384:387:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574:1577 -> a
-    388:419:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2428:2459 -> a
-    388:419:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1578 -> a
-    420:421:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1580 -> a
-    422:422:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
-    422:422:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
-    423:423:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
-    424:431:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1594:1601 -> a
-    432:432:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> a
-    433:453:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1721:1741 -> a
-    433:453:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    454:454:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    454:454:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1742 -> a
-    454:454:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    455:456:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1743:1744 -> a
-    455:456:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    457:457:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1782:1782 -> a
-    458:458:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1796:1796 -> a
-    459:459:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1817:1817 -> a
-    460:460:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825:1825 -> a
-    461:461:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1833:1833 -> a
-    461:461:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    462:462:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    462:462:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1834 -> a
-    462:462:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    463:479:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1836:1852 -> a
-    463:479:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    480:509:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1935:1964 -> a
-    480:509:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    480:509:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    510:525:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1983:1998 -> a
-    510:525:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    510:525:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    510:525:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    526:529:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1984:1987 -> a
-    526:529:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    526:529:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    526:529:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    530:536:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1986:1992 -> a
-    530:536:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    530:536:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    530:536:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    537:546:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1856:1865 -> a
-    537:546:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    547:547:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.overridesMethod(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
-    547:547:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1868 -> a
-    547:547:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    548:552:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1869:1873 -> a
-    548:552:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    553:553:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1884 -> a
-    554:554:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    554:554:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
-    554:554:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884 -> a
-    555:567:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1896 -> a
-    568:568:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1786:1786 -> a
-    568:568:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1904 -> a
-    569:589:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1908:1928 -> a
-    590:590:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1911:1911 -> a
-    591:602:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2032:2043 -> a
-    603:603:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
-    603:603:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2046 -> a
-    604:623:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2045:2064 -> a
-    624:624:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    624:624:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2064 -> a
-    625:630:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2067:2072 -> a
-    631:638:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2081:2088 -> a
-    639:646: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):2097:2104 -> a
-    647:650:boolean verifyKeptGraph():2117:2120 -> a
-    647:650: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):2104 -> a
-    651:669:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2127:2145 -> a
-    651:669:boolean verifyKeptGraph():2120 -> a
-    651:669: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):2104 -> a
-    670:670: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):2105:2105 -> a
-    671:672:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2109:2110 -> a
-    673:688:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2150:2165 -> a
-    689:710:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2164:2185 -> a
-    711:716:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2220:2225 -> a
-    711:716:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2198 -> a
-    717:721:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2199:2203 -> a
-    722:724:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2202:2204 -> a
-    725:725:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2152:2152 -> a
-    726:726:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2157:2157 -> a
-    727:732:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2210:2215 -> a
-    733:771:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2231:2269 -> a
-    772:772:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> a
-    773:773:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2263 -> a
-    774:774:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2260:2260 -> a
-    775:775:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2256:2256 -> a
-    776:776:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2253 -> a
-    777:777:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2250:2250 -> a
-    778:778:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2247:2247 -> a
-    779:779:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1323:1323 -> a
-    779:779:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2247 -> a
-    780:780:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2244:2244 -> a
-    781:828:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2241:2288 -> a
-    829:829:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):105:105 -> a
-    829:829:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288 -> a
-    830:895:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2289:2354 -> a
-    896:905:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2353:2362 -> a
-    906:910:void unpinLambdaMethods():2368:2372 -> a
-    906:910:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2364 -> a
-    911:911:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2362:2362 -> a
-    912:912:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2285:2285 -> a
-    913:913:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2306:2306 -> a
-    914:914:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311:2311 -> a
-    915:915:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    915:915:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311 -> a
-    916:916:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312:2312 -> a
-    917:917:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
-    917:917:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2313 -> a
-    918:918:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    918:918:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
-    918:918:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2313 -> a
-    919:919:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    919:919:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312 -> a
-    920:948:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2376:2404 -> a
-    949:958:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2401:2410 -> a
-    959:966:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2415:2422 -> a
-    967:967:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2503:2503 -> a
-    968:970:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2517:2519 -> a
-    971:971:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    971:971:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519 -> a
-    972:972:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519:2519 -> a
-    973:975:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2542:2544 -> a
-    976:976:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    976:976:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2545 -> a
-    977:978:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2546:2547 -> a
-    979:985:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2559 -> a
-    979:985:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    986:993:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2648:2655 -> a
-    986:993:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    986:993:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    994:1002:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2662 -> a
-    994:1002:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    994:1002:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1003:1003:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1003:1003:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2666 -> a
-    1003:1003:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    1003:1003:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1004:1007:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2668:2671 -> a
-    1004:1007:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    1004:1007:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1008:1008:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2563:2563 -> a
-    1008:1008:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1009:1014:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2678:2683 -> a
-    1009:1014:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1009:1014:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1015:1015:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683 -> a
-    1015:1015:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1015:1015:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1016:1030:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2684:2698 -> a
-    1016:1030:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1016:1030:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1031:1057:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2697:2723 -> a
-    1031:1057:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1031:1057:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1058:1058:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1058:1058:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2725 -> a
-    1058:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1058:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1059:1103:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2727:2771 -> a
-    1059:1103:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1059:1103:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1104:1104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1104:1104:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683 -> a
-    1104:1104:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1104:1104:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1105:1105:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2567:2567 -> a
-    1105:1105:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1106:1111:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2818:2823 -> a
-    1106:1111:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2568 -> a
-    1106:1111:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1112:1112:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2571:2571 -> a
-    1112:1112:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1113:1140:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2781:2808 -> a
-    1113:1140:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2572 -> a
-    1113:1140:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1141:1141:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2575:2575 -> a
-    1141:1141:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1142:1147:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2829:2834 -> a
-    1142:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1142:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
+    135:143:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1607:1615 -> a
+    135:143:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    144:144:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1614:1614 -> a
+    144:144:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    145:145:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1611 -> a
+    145:145:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    146:156:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062:1072 -> a
+    146:156:com.android.tools.r8.graph.DexMethod access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    157:172:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1110:1125 -> a
+    173:173:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1122:1122 -> a
+    174:178:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1137:1141 -> a
+    179:179:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    179:179:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1142 -> a
+    180:180:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145:1145 -> a
+    181:181:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    181:181:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145 -> a
+    182:182:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1147:1147 -> a
+    183:207:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1250 -> a
+    183:207:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1148 -> a
+    208:213:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1151:1156 -> a
+    214:217:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1216:1219 -> a
+    214:217:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    218:223:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):342:347 -> a
+    218:223:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1219 -> a
+    218:223:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    224:224:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1220:1220 -> a
+    224:224:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    225:233:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1179:1187 -> a
+    234:244:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):486:496 -> a
+    234:244:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    245:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    245:245:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497 -> a
+    245:245:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    246:246:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497:497 -> a
+    246:246:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    247:259:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1191:1203 -> a
+    260:260:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    260:260:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204 -> a
+    261:261:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204:1204 -> a
+    262:262:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
+    262:262:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
+    263:263:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
+    263:263:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
+    263:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
+    264:264:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1198:1198 -> a
+    265:268:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1208:1211 -> a
+    269:269:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1256:1256 -> a
+    270:270:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1260:1260 -> a
+    271:271:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
+    271:271:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1261 -> a
+    272:272:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
+    272:272:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2516 -> a
+    273:281:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1278 -> a
+    282:282:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    282:282:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1282 -> a
+    283:286:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1286 -> a
+    287:307:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1290:1310 -> a
+    287:307:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    308:309:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> a
+    308:309:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1311 -> a
+    308:309:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    310:310:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1312:1312 -> a
+    310:310:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    311:339:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1327:1355 -> a
+    340:364:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1360:1384 -> a
+    365:365:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
+    365:365:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    366:366:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    366:366:void reportMissingField(com.android.tools.r8.graph.DexField):1403 -> a
+    366:366:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    367:367:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
+    367:367:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    368:368:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443:1443 -> a
+    369:369:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    369:369:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443 -> a
+    370:378:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> a
+    379:382:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574:1577 -> a
+    383:414:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2449:2480 -> a
+    383:414:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1578 -> a
+    415:416:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1580 -> a
+    417:417:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    417:417:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    418:418:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
+    419:426:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1594:1601 -> a
+    427:427:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1652:1652 -> a
+    428:448:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1720:1740 -> a
+    428:448:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    449:449:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    449:449:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1741 -> a
+    449:449:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    450:451:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1742:1743 -> a
+    450:451:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    452:452:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1781:1781 -> a
+    453:453:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1795:1795 -> a
+    454:454:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1816:1816 -> a
+    455:455:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824:1824 -> a
+    456:482:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1832:1858 -> a
+    456:482:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    483:483:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    483:483:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1859 -> a
+    483:483:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    484:521:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1951:1988 -> a
+    484:521:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    484:521:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    522:537:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2006:2021 -> a
+    522:537:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    522:537:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    522:537:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    538:541:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2007:2010 -> a
+    538:541:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    538:541:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    538:541:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    542:550:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2009:2017 -> a
+    542:550:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    542:550:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    542:550:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    551:560:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1989:1998 -> a
+    551:560:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    551:560:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    561:583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1864:1886 -> a
+    561:583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    584:584:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1894 -> a
+    585:585:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    585:585:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
+    585:585:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894 -> a
+    586:598:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1906 -> a
+    599:599:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1785:1785 -> a
+    599:599:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1914 -> a
+    600:623:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918:1941 -> a
+    624:630:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1938:1944 -> a
+    631:634:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1924 -> a
+    635:635:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1921 -> a
+    636:647:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2053:2064 -> a
+    648:648:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
+    648:648:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2067 -> a
+    649:668:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2066:2085 -> a
+    669:669:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    669:669:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2085 -> a
+    670:675:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2088:2093 -> a
+    676:683:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2102:2109 -> a
+    684:691: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):2118:2125 -> a
+    692:695:boolean verifyKeptGraph():2138:2141 -> a
+    692:695: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):2125 -> a
+    696:714:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2148:2166 -> a
+    696:714:boolean verifyKeptGraph():2141 -> a
+    696:714: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):2125 -> a
+    715:715: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):2126:2126 -> a
+    716:717:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2130:2131 -> a
+    718:733:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2171:2186 -> a
+    734:755:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2185:2206 -> a
+    756:761:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2242:2247 -> a
+    756:761:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2220 -> a
+    762:766:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2221:2225 -> a
+    767:769:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2224:2226 -> a
+    770:770:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2173:2173 -> a
+    771:771:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2178:2178 -> a
+    772:777:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2232:2237 -> a
+    778:816:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2291 -> a
+    817:817:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2288 -> a
+    818:818:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2285:2285 -> a
+    819:819:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2282:2282 -> a
+    820:820:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2278:2278 -> a
+    821:821:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2275:2275 -> a
+    822:822:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2272 -> a
+    823:823:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2269:2269 -> a
+    824:824:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1323:1323 -> a
+    824:824:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2269 -> a
+    825:825:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> a
+    826:873:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2310 -> a
+    874:874:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    874:874:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2310 -> a
+    875:939:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2311:2375 -> a
+    940:949:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2374:2383 -> a
+    950:954:void unpinLambdaMethods():2389:2393 -> a
+    950:954:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2385 -> a
+    955:955:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2383:2383 -> a
+    956:956:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2307:2307 -> a
+    957:957:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2328:2328 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333:2333 -> a
+    959:959:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334:2334 -> a
+    961:961:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
+    961:961:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335 -> a
+    962:962:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
+    962:962:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
+    962:962:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335 -> a
+    963:963:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    963:963:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334 -> a
+    964:992:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2397:2425 -> a
+    993:1002:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2422:2431 -> a
+    1003:1010:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2436:2443 -> a
+    1011:1011:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2524:2524 -> a
+    1012:1014:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2538:2540 -> a
+    1015:1015:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1015:1015:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540 -> a
+    1016:1016:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540:2540 -> a
+    1017:1019:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2563:2565 -> a
+    1020:1020:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    1020:1020:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2566 -> a
+    1021:1022:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2567:2568 -> a
+    1023:1029:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2574:2580 -> a
+    1023:1029:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1030:1037:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669:2676 -> a
+    1030:1037:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1030:1037:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1038:1046:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2683 -> a
+    1038:1046:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1038:1046:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1047:1047:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1047:1047:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2687 -> a
+    1047:1047:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1047:1047:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1048:1051:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2689:2692 -> a
+    1048:1051:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1048:1051:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1052:1052:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2584:2584 -> a
+    1052:1052:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1053:1058:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2699:2704 -> a
+    1053:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1053:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1059:1059:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1059:1059:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2704 -> a
+    1059:1059:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1059:1059:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1060:1074:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2705:2719 -> a
+    1060:1074:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1060:1074:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1075:1101:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2718:2744 -> a
+    1075:1101:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1075:1101:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1102:1102:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1102:1102:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2746 -> a
+    1102:1102:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1102:1102:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1103:1147:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2748:2792 -> a
+    1103:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1103:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
     1148:1148:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1148:1148:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2834 -> a
-    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1149:1161:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2835:2847 -> a
-    1149:1161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1149:1161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1162:1178:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2840:2856 -> a
-    1162:1178:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1162:1178:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1179:1179:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1179:1179:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2834 -> a
-    1179:1179:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1179:1179:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1180:1194:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2579:2593 -> a
-    1180:1194:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1195:1195:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1195:1195:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2594 -> a
-    1195:1195:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1196:1224:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2595:2623 -> a
-    1196:1224:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1225:1225:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> a
-    1225:1225:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2623 -> a
-    1225:1225:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1226:1226:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> a
-    1226:1226:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1227:1227:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> a
-    1227:1227:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624 -> a
-    1227:1227:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1228:1242:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2627:2641 -> a
-    1228:1242:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1243:1243:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2639:2639 -> a
-    1243:1243:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1244:1244:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2638:2638 -> a
-    1244:1244:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1245:1245:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    1245:1245:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2545 -> a
-    1246:1258:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2862:2874 -> a
-    1259:1263:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3257:3261 -> a
-    1264:1264:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3341:3341 -> a
-    1264:1264:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3261 -> a
-    1265:1266:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3261:3262 -> a
-    1267:1270:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3288:3291 -> a
-    1271:1271:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3325:3325 -> a
-    1272:1272:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3341:3341 -> a
-    1272:1272:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3326 -> a
-    1273:1273:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3328:3328 -> a
-    1274:1274:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3358:3358 -> a
-    1274:1274:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3329 -> a
-    1275:1277:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3330:3332 -> a
-    1278:1287:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3345:3354 -> a
-    1288:1288:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> a
-    1289:1289:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3366:3366 -> a
-    1290:1293:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3367:3370 -> a
-    1294:1294:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3375:3375 -> a
-    1295:1295:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3386:3386 -> a
-    1296:1298:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3389:3391 -> a
-    1299:1299:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1299:1299:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3392 -> a
-    1300:1303:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3392:3395 -> a
-    1304:1304:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1304:1304:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3397 -> a
-    1305:1310:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3397:3402 -> a
-    1311:1311:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1311:1311:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3402 -> a
-    1312:1312:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3402:3402 -> a
-    1313:1313:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3396:3396 -> a
-    1314:1314:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3407:3407 -> a
-    1315:1317:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3410:3412 -> a
-    1318:1318:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1318:1318:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3414 -> a
-    1319:1320:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3414:3415 -> a
-    1321:1321:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1321:1321:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3416 -> a
-    1322:1322:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3416:3416 -> a
-    1323:1323:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3413:3413 -> a
-    1324:1344:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3429:3449 -> a
-    1345:1345:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3434:3434 -> a
-    1346:1350:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3442:3446 -> a
+    1148:1148:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2704 -> a
+    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1149:1149:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2588:2588 -> a
+    1149:1149:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1150:1155:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2839:2844 -> a
+    1150:1155:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2589 -> a
+    1150:1155:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1156:1156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2592:2592 -> a
+    1156:1156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1157:1184:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2802:2829 -> a
+    1157:1184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2593 -> a
+    1157:1184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1185:1185:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2596:2596 -> a
+    1185:1185:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1186:1191:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2850:2855 -> a
+    1186:1191:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1186:1191:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1192:1192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1192:1192:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> a
+    1192:1192:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1192:1192:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1193:1205:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2868 -> a
+    1193:1205:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1193:1205:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1206:1222:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861:2877 -> a
+    1206:1222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1206:1222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1223:1223:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1223:1223:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> a
+    1223:1223:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1223:1223:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1224:1238:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2600:2614 -> a
+    1224:1238:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1239:1239:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1239:1239:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2615 -> a
+    1239:1239:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1240:1268:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2616:2644 -> a
+    1240:1268:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1269:1269:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> a
+    1269:1269:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2644 -> a
+    1269:1269:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1270:1270:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2645:2645 -> a
+    1270:1270:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1271:1271:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> a
+    1271:1271:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2645 -> a
+    1271:1271:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1272:1286:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2648:2662 -> a
+    1272:1286:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1287:1287:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2660:2660 -> a
+    1287:1287:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1288:1288:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2659:2659 -> a
+    1288:1288:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1289:1289:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    1289:1289:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2566 -> a
+    1290:1302:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2883:2895 -> a
+    1303:1307:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3338:3342 -> a
+    1308:1308:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3411:3411 -> a
+    1308:1308:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3342 -> a
+    1309:1310:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3342:3343 -> a
+    1311:1314:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3369:3372 -> a
+    1315:1315:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3395:3395 -> a
+    1316:1316:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3411:3411 -> a
+    1316:1316:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3396 -> a
+    1317:1317:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3398:3398 -> a
+    1318:1318:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3428:3428 -> a
+    1318:1318:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3399 -> a
+    1319:1321:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3400:3402 -> a
+    1322:1331:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3415:3424 -> a
+    1332:1332:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> a
+    1333:1333:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3436:3436 -> a
+    1334:1337:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3437:3440 -> a
+    1338:1338:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3445:3445 -> a
+    1339:1339:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3456:3456 -> a
+    1340:1342:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459:3461 -> a
+    1343:1343:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1343:1343:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3462 -> a
+    1344:1347:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3462:3465 -> a
+    1348:1348:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1348:1348:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3467 -> a
+    1349:1354:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3467:3472 -> a
+    1355:1355:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1355:1355:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3472 -> a
+    1356:1356:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3472:3472 -> a
+    1357:1357:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3466:3466 -> a
+    1358:1358:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3477:3477 -> a
+    1359:1361:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3480:3482 -> a
+    1362:1362:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1362:1362:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3484 -> a
+    1363:1364:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3484:3485 -> a
+    1365:1365:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1365:1365:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3486 -> a
+    1366:1366:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3486:3486 -> a
+    1367:1367:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3483:3483 -> a
+    1368:1388:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3499:3519 -> a
+    1389:1389:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3504:3504 -> a
+    1390:1394:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3512:3516 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1692 -> b
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1691 -> b
     2:2:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.shaking.Enqueuer):117:117 -> b
     3:3:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> b
     4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> b
@@ -56876,40 +57144,40 @@
     41:41:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1199:1199 -> b
     42:42:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> b
     42:42:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1419 -> b
-    43:49:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1643:1649 -> b
-    50:50:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1654:1654 -> b
-    51:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1696:1701 -> b
+    43:49:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1642:1648 -> b
+    50:50:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> b
+    51:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1695:1700 -> b
     57:57:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    57:57:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1701 -> b
-    58:65:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1703:1710 -> b
-    66:74:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1751:1759 -> b
+    57:57:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1700 -> b
+    58:65:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1702:1709 -> b
+    66:74:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1750:1758 -> b
     75:76:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1080:1081 -> b
-    75:76:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759 -> b
-    77:77:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1760 -> b
+    75:76:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1758 -> b
+    77:77:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759:1759 -> b
     78:78:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1086:1086 -> b
-    78:78:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760 -> b
-    79:81:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761:1763 -> b
+    78:78:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759 -> b
+    79:81:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1762 -> b
     82:82:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    82:82:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1762 -> b
-    83:83:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1798:1798 -> b
-    84:84:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1895:1895 -> b
-    85:89:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2004:2008 -> b
-    85:89:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    90:90:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> b
-    90:90:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2008 -> b
-    90:90:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    91:91:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2008:2008 -> b
-    91:91:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    92:97:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2007:2012 -> b
-    92:97:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    98:104:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016:2022 -> b
-    105:105:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2068:2068 -> b
-    106:106:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2333:2333 -> b
-    107:110:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3306:3309 -> b
-    111:112:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3336:3337 -> b
-    111:112:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3309 -> b
-    113:115:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3312:3314 -> b
-    116:116:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> b
+    82:82:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> b
+    83:83:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1797:1797 -> b
+    84:84:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1905:1905 -> b
+    85:89:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2025:2029 -> b
+    85:89:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    90:90:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    90:90:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2029 -> b
+    90:90:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    91:91:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2029:2029 -> b
+    91:91:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    92:97:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2028:2033 -> b
+    92:97:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    98:104:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037:2043 -> b
+    105:105:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2089:2089 -> b
+    106:106:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2355:2355 -> b
+    107:110:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3376:3379 -> b
+    111:112:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3406:3407 -> b
+    111:112:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3379 -> b
+    113:115:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3382:3384 -> b
+    116:116:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> b
     1:1:java.util.Map access$1100(com.android.tools.r8.shaking.Enqueuer):117:117 -> c
     2:2:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> c
     3:4:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():384:385 -> c
@@ -56922,81 +57190,81 @@
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
     23:23:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1422 -> c
     24:27:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1424:1427 -> c
-    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> c
+    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559:2559 -> c
     28:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    29:34:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> c
-    29:34:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538 -> c
+    29:34:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3215:3220 -> c
+    29:34:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559 -> c
     29:34:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    35:35:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> c
+    35:35:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559:2559 -> c
     35:35:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    36:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3158:3158 -> c
-    36:36:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538 -> c
+    36:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> c
+    36:36:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559 -> c
     36:36:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
     37:37:com.android.tools.r8.shaking.KeepReason lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1415:1415 -> c
     38:50:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1466:1478 -> c
-    51:51:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1661:1661 -> c
-    52:53:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714:1715 -> c
+    51:51:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1660:1660 -> c
+    52:53:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1713:1714 -> c
     54:54:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    54:54:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1715 -> c
-    55:55:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1717:1717 -> c
-    56:57:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1790:1791 -> c
+    54:54:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714 -> c
+    55:55:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1716:1716 -> c
+    56:57:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1789:1790 -> c
     58:58:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    58:58:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1792 -> c
-    59:74:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1795:1810 -> c
-    75:75:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1786:1786 -> c
-    75:75:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812 -> c
-    76:81:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1813:1818 -> c
-    82:93:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2468:2479 -> c
+    58:58:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1791 -> c
+    59:74:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1794:1809 -> c
+    75:75:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1785:1785 -> c
+    75:75:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1811 -> c
+    76:81:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1817 -> c
+    82:93:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> c
     94:94:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    94:94:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2479 -> c
-    95:99:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2481:2485 -> c
-    100:103:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2484:2487 -> c
-    104:121:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2486:2503 -> c
+    94:94:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> c
+    95:99:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> c
+    100:103:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> c
+    104:121:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2524 -> c
     1:1:java.util.Map access$1300(com.android.tools.r8.shaking.Enqueuer):117:117 -> d
     2:8:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):475:481 -> d
-    9:10:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1653:1654 -> d
-    11:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1659:1665 -> d
+    9:10:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1652:1653 -> d
+    11:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1658:1664 -> d
     18:19:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> d
-    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1670 -> d
-    20:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1675:1676 -> d
+    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1669 -> d
+    20:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1674:1675 -> d
     22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> d
-    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1677 -> d
-    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680:1680 -> d
+    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1676 -> d
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1679:1679 -> d
     24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    24:24:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1681 -> d
-    25:32:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1685:1692 -> d
-    33:33:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1663:1663 -> d
-    34:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1769:1773 -> d
-    39:39:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1771:1771 -> d
+    24:24:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    25:32:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684:1691 -> d
+    33:33:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1662:1662 -> d
+    34:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1768:1772 -> d
+    39:39:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1770:1770 -> d
     40:40:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> d
-    40:40:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1772 -> d
-    41:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1774:1775 -> d
+    40:40:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1771 -> d
+    41:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1774 -> d
     43:43:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    43:43:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> d
-    44:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2507:2511 -> d
-    49:49:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2509:2509 -> d
-    50:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2524:2529 -> d
+    43:43:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775 -> d
+    44:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2528:2532 -> d
+    49:49:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2530:2530 -> d
+    50:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2550 -> d
     50:55:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
     56:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> d
-    56:56:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2530 -> d
+    56:56:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2551 -> d
     56:56:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    57:59:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2533 -> d
+    57:59:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2554 -> d
     57:59:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    60:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2531 -> d
+    60:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2552 -> d
     60:60:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2524:2524 -> d
+    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2545 -> d
     61:61:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    62:64:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3378:3380 -> d
-    65:65:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> d
-    65:65:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3381 -> d
-    66:66:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3381:3381 -> d
+    62:64:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3448:3450 -> d
+    65:65:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> d
+    65:65:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3451 -> d
+    66:66:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3451:3451 -> d
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1500(com.android.tools.r8.shaking.Enqueuer):117:117 -> e
     2:2:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> e
     3:5:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1131 -> e
     6:6:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1129 -> e
     7:7:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1278:1278 -> e
-    8:8:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2513:2513 -> e
-    9:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3318:3321 -> e
+    8:8:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> e
+    9:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3388:3391 -> e
     1:1:java.util.Set access$1800(com.android.tools.r8.shaking.Enqueuer):117:117 -> f
     2:2:com.android.tools.r8.shaking.KeepReason lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):529:529 -> f
     3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1105:1105 -> f
@@ -57011,20 +57279,20 @@
     49:49:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
     50:75:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1531:1556 -> f
     50:75:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
-    76:80:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1628:1632 -> f
+    76:80:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1627:1631 -> f
     76:80:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
     81:81:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> f
-    81:81:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1632 -> f
+    81:81:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631 -> f
     81:81:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
-    82:86:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1632:1636 -> f
+    82:86:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> f
     82:86:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
     87:87:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1462:1462 -> f
     1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer):117:117 -> g
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1124:1124 -> g
-    3:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3281:3284 -> g
+    3:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3362:3365 -> g
     1:1:java.util.Set access$2400(com.android.tools.r8.shaking.Enqueuer):117:117 -> h
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1131:1131 -> h
-    3:7:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3273:3277 -> h
+    3:7:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3354:3358 -> h
     1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):117:117 -> i
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1154:1154 -> i
     1:1:com.android.tools.r8.utils.InternalOptions access$2800(com.android.tools.r8.shaking.Enqueuer):117:117 -> j
@@ -57045,80 +57313,97 @@
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
     int[] $SwitchMap$com$android$tools$r8$shaking$EnqueuerWorklist$Action$Kind -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():2239:2239 -> <clinit>
+    1:1:void <clinit>():2261:2261 -> <clinit>
     2:2:void <clinit>():990:990 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):2960:2960 -> <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):2967:2970 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3017:3017 -> <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):3024:3027 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):2980:2994 -> b
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    16:16:boolean addField(com.android.tools.r8.graph.DexField):2994 -> b
-    17:29:boolean addField(com.android.tools.r8.graph.DexField):2994:3006 -> b
-    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3014:3023 -> b
-    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3022:3029 -> b
-    48:49:boolean addType(com.android.tools.r8.graph.DexType):3059:3060 -> b
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3037:3051 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3051 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3051:3063 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3071:3080 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3079:3086 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3116:3117 -> b
 com.android.tools.r8.shaking.Enqueuer$GraphReporter -> com.android.tools.r8.N.u:
     com.android.tools.r8.shaking.Enqueuer this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():3066:3066 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3066:3066 -> <init>
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3069:3075 -> a
-    8:10:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3090:3092 -> a
-    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3080:3085 -> a
-    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3093 -> a
-    17:17:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3096:3096 -> a
-    18:20:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3113:3115 -> a
-    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3101:3106 -> a
-    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3116 -> a
-    27:27:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3119:3119 -> a
-    28:30:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3134:3136 -> a
-    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3124:3129 -> a
-    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3137 -> a
-    37:37:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3140:3140 -> a
-    38:43:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3179:3184 -> a
-    44:49:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3189:3194 -> a
-    50:57:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3198:3205 -> a
-    50:57:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    58:58:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3203:3203 -> a
-    58:58:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    59:59:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3198:3198 -> a
-    59:59:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    60:66:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3211:3217 -> a
-    60:66:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    67:67:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    67:67:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    68:68:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3211:3211 -> a
-    68:68:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    69:71:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3223:3225 -> a
-    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3168:3171 -> b
-    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3169:3174 -> b
-    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3145:3146 -> c
+    1:1:void <clinit>():3123:3123 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3123:3123 -> <init>
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3126:3132 -> a
+    8:10:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3147:3149 -> a
+    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3137:3142 -> a
+    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3150 -> a
+    17:17:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3153:3153 -> a
+    18:20:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3170:3172 -> a
+    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> a
+    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3173 -> a
+    27:27:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3176:3176 -> a
+    28:30:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3191:3193 -> a
+    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3181:3186 -> a
+    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3194 -> a
+    37:37:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3197:3197 -> a
+    38:43:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3236:3241 -> a
+    44:49:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3246:3251 -> a
+    50:53:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3256:3259 -> a
+    54:59:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3257:3262 -> a
+    60:67:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):3267:3274 -> a
+    68:75:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3278:3285 -> a
+    68:75:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    76:76:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3283:3283 -> a
+    76:76:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    77:77:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3278:3278 -> a
+    77:77:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    78:84:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3291:3297 -> a
+    78:84:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    85:85:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3295:3295 -> a
+    85:85:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    86:86:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3291:3291 -> a
+    86:86:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    87:89:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3303:3305 -> a
+    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3225:3228 -> b
+    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3226:3231 -> b
+    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3202:3203 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146 -> c
-    4:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146:3150 -> c
-    9:14:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3148:3153 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203 -> c
+    4:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203:3207 -> c
+    9:14:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3205:3210 -> c
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness -> com.android.tools.r8.N.w:
     com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness INSTANCE -> a
     com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness COMPAT_INSTANCE -> b
-    1:2:void <clinit>():3236:3237 -> <clinit>
-    1:1:void <init>():3234:3234 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3234:3234 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3252:3252 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3247:3247 -> b
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3234:3234 -> e
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3234:3234 -> f
+    1:2:void <clinit>():3317:3318 -> <clinit>
+    1:1:void <init>():3315:3315 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3315:3315 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3333:3333 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3328:3328 -> b
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3315:3315 -> e
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3315:3315 -> f
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness$1 -> com.android.tools.r8.N.v:
-    1:1:void <init>():3238:3238 -> <init>
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.x:
+    1:1:void <init>():3319:3319 -> <init>
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.x:
+    com.android.tools.r8.graph.DexClass holder -> a
+    com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> d
+    1:3:void <clinit>():2924:2926 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2935:2938 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> a
+    1:1:boolean isUnresolved():2942 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> b
+    1:2:boolean equals(java.lang.Object):2954:2955 -> equals
+    1:1:int hashCode():2948:2948 -> hashCode
+    2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
+    2:2:int hashCode():2948 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.y:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
@@ -57130,24 +57415,25 @@
     2:2:boolean isInitialOrFinalTreeShaking():134 -> a
     1:1:boolean isInitialTreeShaking():126:126 -> b
     1:1:boolean isTracingMainDex():138:138 -> c
-com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.y:
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.z:
+    java.util.Map methods -> a
+    1:3:void <init>():2959:2961 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2959:2959 -> <init>
+    1:1:java.util.Set getMethods():2964:2964 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2968:2968 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2972 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2974:2979 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2968:2968 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.A:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2885:2885 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2881:2886 -> <init>
-    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2879:2879 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2890:2891 -> a
-    4:4:boolean contains(java.lang.Object):2895:2895 -> a
-    5:5:java.util.Set getItems():2899:2899 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason -> com.android.tools.r8.N.z:
-    java.util.Map reasons -> c
-    1:2:void <init>(java.util.function.BiConsumer,java.util.Map):2913:2914 -> <init>
-    1:1:java.util.function.BiConsumer register(java.util.Map):2918:2918 -> a
-    2:2:void lambda$register$1(java.util.Map,java.lang.Object,com.android.tools.r8.shaking.KeepReason):2919:2919 -> a
-    1:2:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason create():2907:2908 -> b
-    3:3:java.util.Set getReasons(java.lang.Object):2923:2923 -> b
-    1:1:java.util.Set lambda$register$0(java.lang.Object):2919:2919 -> c
-com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.A:
+    1:1:void <init>(java.util.function.BiConsumer):2906:2906 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2902:2907 -> <init>
+    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2900:2900 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2911:2912 -> a
+    4:4:boolean contains(java.lang.Object):2916:2916 -> a
+    5:5:java.util.Set getItems():2920:2920 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.B:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
@@ -57229,14 +57515,14 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):599:599 -> e
     2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1037:1046 -> e
     12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1045:1045 -> e
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.C:
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.D:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.G:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.H:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
@@ -57255,15 +57541,15 @@
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():61:61 -> b
     2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):73:73 -> b
     1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):69:69 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$1 -> com.android.tools.r8.N.D:
-com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.F:
+com.android.tools.r8.shaking.EnqueuerWorklist$1 -> com.android.tools.r8.N.E:
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.G:
     com.android.tools.r8.shaking.KeepReason reason -> d
     com.android.tools.r8.graph.DexItem target -> b
     com.android.tools.r8.graph.DexItem context -> c
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind kind -> a
     1:1:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.EnqueuerWorklist$1):18:18 -> <init>
     2:6:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):37:41 -> <init>
-com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind -> com.android.tools.r8.N.E:
+com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind -> com.android.tools.r8.N.F:
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_INSTANTIATED -> f
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_METHOD_LIVE -> g
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_SUPER -> d
@@ -57278,7 +57564,7 @@
     10:10:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind[] values():20:20 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.H:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.I:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -57297,7 +57583,7 @@
     1:1:boolean isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.I:
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.J:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -57305,7 +57591,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.J:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.K:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -57354,7 +57640,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.N:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.O:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -57396,14 +57682,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.K:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.L:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.L:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.M:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.M:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.N:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -57425,81 +57711,78 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):32:32 -> c
     boolean isInstantiatedIn() -> d
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> d
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.O:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.P:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.P:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Q:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():304:304 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):304:304 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):308:309 -> <init>
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):319:325 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():314:314 -> b
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Q:
+    1:1:void <clinit>():283:283 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):283:283 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):287:288 -> <init>
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):298:304 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():293:293 -> b
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.S:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):95:95 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):99:100 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():106:106 -> e
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.S:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):132:132 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):91:91 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):95:96 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):107:107 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():102:102 -> e
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.T:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):111:111 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):114:114 -> <init>
     com.android.tools.r8.shaking.KeepReason$InstatiatedIn asInstantiatedIn() -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):132:132 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> b
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():129:129 -> b
     boolean isInstantiatedIn() -> d
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():132:132 -> e
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.T:
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():111:111 -> e
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.U:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():193:193 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):193:193 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():202:202 -> b
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.U:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):211:211 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):214:214 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():219:219 -> b
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.V:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):159:159 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):162:162 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():167:167 -> b
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.W:
+    1:1:void <clinit>():172:172 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):172:172 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175:176 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():181:181 -> b
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.V:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):190:190 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):193:193 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():198:198 -> b
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.W:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):138:138 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():146:146 -> b
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.X:
     com.android.tools.r8.graph.DexType implementer -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):269:270 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):281:281 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():276:276 -> b
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.X:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):352:352 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():360:360 -> b
-com.android.tools.r8.shaking.KeepReason$OverridesMethod -> com.android.tools.r8.N.Y:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():123:123 -> b
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.Z:
-    com.android.tools.r8.graph.DexType type -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):245:245 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType):249:250 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):243:243 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):248:249 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):260:260 -> a
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():255:255 -> b
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.Y:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):331:331 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):334:334 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():339:339 -> b
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.Z:
+    com.android.tools.r8.graph.DexType type -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):224:224 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):228:229 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):239:239 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():234:234 -> b
 com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.a0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):228:228 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):231:231 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():236:236 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):207:207 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):210:210 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():215:215 -> b
 com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.b0:
     com.android.tools.r8.graph.DexItem holder -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):285:285 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexItem):289:290 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):300:300 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():295:295 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):268:269 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):279:279 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():274:274 -> b
 com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.c0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):330:330 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):333:333 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():343:343 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():322:322 -> b
     boolean isDueToReflectiveUse() -> c
 com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.d0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):179:179 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():184:184 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):155:155 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):158:158 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():163:163 -> b
 com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.f0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
@@ -58228,9 +58511,9 @@
     25:32:void parse(java.util.List):177:184 -> a
     33:34:void parse(java.util.List):181:182 -> a
     35:41:void parse(java.util.List):181:187 -> a
-    42:48:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1994:2000 -> a
+    42:48:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2010:2016 -> a
     42:48:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
-    49:49:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1994:1994 -> a
+    49:49:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2010:2010 -> a
     49:49:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
     1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> b
     2:2:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():123:123 -> b
@@ -58248,14 +58531,14 @@
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.b1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):2008:2010 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2014:2014 -> a
-    2:3:boolean hasBackreference():2022:2023 -> a
-    1:15:boolean hasUnusualCharacters():2027:2041 -> b
+    1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
+    2:3:boolean hasBackreference():2038:2039 -> a
+    1:15:boolean hasUnusualCharacters():2043:2057 -> b
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.c1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2052:2054 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.d1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
@@ -58277,535 +58560,535 @@
     java.util.function.Predicate CLASS_NAME_PREDICATE -> i
     1:1:void <clinit>():196:196 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):206:206 -> <init>
-    2:1368:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1565 -> <init>
-    1369:1372:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
+    2:1384:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1581 -> <init>
+    1385:1388:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
     1:4:void parse():216:219 -> a
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464:466 -> a
+    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469:471 -> a
     8:10:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    8:10:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464 -> a
-    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):623:623 -> a
+    8:10:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469 -> a
+    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628:628 -> a
     12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
-    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):624 -> a
+    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):629 -> a
     13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:55 -> a
-    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):625 -> a
-    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):811:812 -> a
-    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):630 -> a
+    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):827:828 -> a
+    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     16:16:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813 -> a
-    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813:820 -> a
-    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):829 -> a
+    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):829:836 -> a
+    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     25:25:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):821 -> a
-    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):821:823 -> a
-    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):837 -> a
+    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):837:839 -> a
+    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     29:29:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):824 -> a
-    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):824:830 -> a
-    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):459:459 -> a
-    37:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):831 -> a
-    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    38:45:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):834:841 -> a
-    38:45:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    46:46:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):459:459 -> a
-    46:46:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):842 -> a
-    46:46:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    47:52:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):848:853 -> a
-    47:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    47:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):840 -> a
+    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):840:846 -> a
+    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):464:464 -> a
+    37:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):847 -> a
+    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    38:45:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):850:857 -> a
+    38:45:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    46:46:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):464:464 -> a
+    46:46:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858 -> a
+    46:46:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    47:52:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):864:869 -> a
+    47:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    47:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     53:53:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    53:53:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):854 -> a
-    53:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    53:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    54:55:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):854:855 -> a
-    54:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    54:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    53:53:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):870 -> a
+    53:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    53:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    54:55:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):870:871 -> a
+    54:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    54:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     56:56:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    56:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):856 -> a
-    56:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    56:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    57:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):856:857 -> a
-    57:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    57:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    56:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):872 -> a
+    56:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    56:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    57:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):872:873 -> a
+    57:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    57:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     59:59:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858 -> a
-    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    60:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858:860 -> a
-    60:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    60:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):874 -> a
+    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    60:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):874:876 -> a
+    60:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    60:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     63:63:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):861 -> a
-    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):861:862 -> a
-    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    66:67:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1967 -> a
-    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):863 -> a
-    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    68:68:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1966 -> a
-    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):863 -> a
-    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):865:865 -> a
-    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    70:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):627:627 -> a
+    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):877 -> a
+    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):877:878 -> a
+    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    66:67:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1983 -> a
+    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):879 -> a
+    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    68:68:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1982 -> a
+    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):879 -> a
+    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):881:881 -> a
+    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    70:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):632:632 -> a
     71:71:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628 -> a
-    72:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628:633 -> a
-    78:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):632:635 -> a
+    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):633 -> a
+    72:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):633:638 -> a
+    78:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):637:640 -> a
     82:82:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):636 -> a
-    83:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):636:639 -> a
+    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641 -> a
+    83:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641:644 -> a
     87:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> a
-    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):639 -> a
+    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):644 -> a
     88:88:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> a
-    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):640 -> a
-    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641:641 -> a
-    90:90:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):704:704 -> a
+    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):645 -> a
+    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):646:646 -> a
+    90:90:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):709:709 -> a
     91:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
-    91:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):705 -> a
+    91:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):710 -> a
     92:92:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:55 -> a
-    92:92:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):706 -> a
+    92:92:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):711 -> a
     93:93:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
-    93:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):707 -> a
-    94:96:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):708:710 -> a
+    93:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):712 -> a
+    94:96:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):713:715 -> a
     97:97:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> a
-    97:97:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):710 -> a
+    97:97:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):715 -> a
     98:98:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> a
-    98:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):711 -> a
+    98:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):716 -> a
     99:99:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
-    99:99:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):712 -> a
-    100:105:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):895:900 -> a
-    100:105:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    99:99:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):717 -> a
+    100:105:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):911:916 -> a
+    100:105:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     106:106:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAnnotation():159:159 -> a
-    106:106:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):900 -> a
-    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    107:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):900:900 -> a
-    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    106:106:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):916 -> a
+    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    107:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):916:916 -> a
+    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     108:108:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):163:163 -> a
-    108:108:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):901 -> a
-    108:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    109:109:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):903:903 -> a
-    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    110:111:boolean parseNegation():888:889 -> a
-    110:111:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):905 -> a
-    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    108:108:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):917 -> a
+    108:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    109:109:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):919:919 -> a
+    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    110:111:boolean parseNegation():904:905 -> a
+    110:111:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):921 -> a
+    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     112:112:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():151:151 -> a
-    112:112:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):906 -> a
-    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    112:112:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):922 -> a
+    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     113:113:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():143:143 -> a
-    113:113:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):907 -> a
-    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    114:123:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):908:917 -> a
-    114:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    124:126:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):930:932 -> a
-    124:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    113:113:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):923 -> a
+    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    114:123:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):924:933 -> a
+    114:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    124:126:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):946:948 -> a
+    124:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     127:127:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):139:139 -> a
-    127:127:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):933 -> a
-    127:127:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    128:131:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):935:938 -> a
-    128:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    127:127:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
+    127:127:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    128:131:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):951:954 -> a
+    128:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     132:133:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    132:133:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):938 -> a
-    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    134:134:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940:940 -> a
-    134:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    135:136:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):925:926 -> a
-    135:136:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940 -> a
-    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    132:133:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):954 -> a
+    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    134:134:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956:956 -> a
+    134:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    135:136:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):941:942 -> a
+    135:136:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956 -> a
+    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     137:139:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    137:139:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940 -> a
-    137:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    140:141:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):942:943 -> a
-    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    137:139:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956 -> a
+    137:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    140:141:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):958:959 -> a
+    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     142:143:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    142:143:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):943 -> a
-    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    144:145:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):944:945 -> a
-    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    142:143:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):959 -> a
+    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    144:145:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):960:961 -> a
+    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     146:147:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    146:147:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):945 -> a
-    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    148:149:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):946:947 -> a
-    148:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    146:147:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):961 -> a
+    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    148:149:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):962:963 -> a
+    148:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     150:151:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    150:151:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):947 -> a
-    150:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    152:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):805:805 -> a
+    150:151:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963 -> a
+    150:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    152:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):821:821 -> a
     153:154:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassNames(com.android.tools.r8.shaking.ProguardClassNameList):121:122 -> a
-    153:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):805 -> a
-    155:156:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):955:956 -> a
-    155:156:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    153:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):821 -> a
+    155:156:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):971:972 -> a
+    155:156:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     157:157:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    157:157:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):957 -> a
-    157:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    158:158:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):958:958 -> a
-    158:158:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    157:157:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):973 -> a
+    157:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    158:158:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):974:974 -> a
+    158:158:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     159:159:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    159:159:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):959 -> a
-    159:159:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    160:160:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963:963 -> a
-    160:160:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    159:159:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):975 -> a
+    159:159:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    160:160:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):979:979 -> a
+    160:160:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     161:161:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):113:113 -> a
-    161:161:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963 -> a
-    161:161:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    162:163:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964:965 -> a
-    162:163:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    164:164:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964:964 -> a
-    164:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    161:161:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):979 -> a
+    161:161:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    162:163:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980:981 -> a
+    162:163:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    164:164:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980:980 -> a
+    164:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     165:165:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):105:105 -> a
-    165:165:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964 -> a
-    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    166:167:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):974:975 -> a
-    166:167:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    168:170:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):987:989 -> a
-    168:170:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    168:170:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    171:171:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):997:997 -> a
-    171:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    171:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    171:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    172:173:boolean parseNegation():888:889 -> a
-    172:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):999 -> a
-    172:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    172:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    172:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    174:219:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1001:1046 -> a
-    174:219:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    174:219:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    174:219:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    220:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1034:1051 -> a
-    220:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    220:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    220:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    238:243:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1025:1030 -> a
-    238:243:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    238:243:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    238:243:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    244:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1020:1021 -> a
-    244:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    244:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    244:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1015:1016 -> a
-    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1010:1011 -> a
-    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    250:306:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1005:1061 -> a
-    250:306:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    250:306:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    250:306:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    307:344:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1069:1106 -> a
-    307:344:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    307:344:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    307:344:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    165:165:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980 -> a
+    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    166:167:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):990:991 -> a
+    166:167:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    168:170:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1003:1005 -> a
+    168:170:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    168:170:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    171:171:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1013:1013 -> a
+    171:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    171:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    171:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    172:173:boolean parseNegation():904:905 -> a
+    172:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1015 -> a
+    172:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    172:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    172:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    174:219:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1017:1062 -> a
+    174:219:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    174:219:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    174:219:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    220:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1050:1067 -> a
+    220:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    220:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    220:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    238:243:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1041:1046 -> a
+    238:243:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    238:243:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    238:243:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    244:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1036:1037 -> a
+    244:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    244:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    244:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1031:1032 -> a
+    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1026:1027 -> a
+    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    250:306:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1021:1077 -> a
+    250:306:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    250:306:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    250:306:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    307:344:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1085:1122 -> a
+    307:344:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    307:344:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    307:344:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     345:345:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():123:123 -> a
-    345:345:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1107 -> a
-    345:345:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    345:345:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    345:345:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    346:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1108:1114 -> a
-    346:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    346:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    346:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    353:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1109:1117 -> a
-    353:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    353:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    353:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    345:345:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1123 -> a
+    345:345:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    345:345:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    345:345:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    346:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1124:1130 -> a
+    346:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    346:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    346:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    353:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1125:1133 -> a
+    353:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    353:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    353:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     362:362:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():123:123 -> a
-    362:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1118 -> a
-    362:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    362:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    362:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    363:369:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1119:1125 -> a
-    363:369:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    363:369:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    363:369:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    370:392:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1120:1142 -> a
-    370:392:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    370:392:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    370:392:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    393:407:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1141:1155 -> a
-    393:407:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    393:407:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    393:407:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    408:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1154:1168 -> a
-    408:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    408:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    408:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    423:428:java.lang.String acceptFieldNameOrIntegerForReturn():1705:1710 -> a
-    423:428:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    423:428:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    423:428:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    423:428:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    429:429:char peekCharAt(int):1503:1503 -> a
-    429:429:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    429:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    429:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    429:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    429:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    430:430:boolean eof(int):1452:1452 -> a
-    430:430:char peekCharAt(int):1503 -> a
-    430:430:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    430:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    430:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    430:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    430:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    431:432:char peekCharAt(int):1503:1504 -> a
-    431:432:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    431:432:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    431:432:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    431:432:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    431:432:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    433:445:java.lang.String acceptFieldNameOrIntegerForReturn():1714:1726 -> a
-    433:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    433:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    433:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    433:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    446:447:boolean isInteger(java.lang.String):1439:1440 -> a
-    446:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1171 -> a
-    446:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    446:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    446:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    448:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1172:1186 -> a
-    448:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    448:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    448:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185:1185 -> a
-    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    464:476:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1183:1195 -> a
-    464:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    464:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    464:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    477:477:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1194:1194 -> a
-    477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1193 -> a
-    478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    478:478:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    479:481:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1196:1198 -> a
-    479:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    479:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    479:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    482:505:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1197:1220 -> a
-    482:505:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    482:505:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    482:505:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    506:506:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):992:992 -> a
-    506:506:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    506:506:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    362:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1134 -> a
+    362:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    362:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    362:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    363:369:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1135:1141 -> a
+    363:369:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    363:369:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    363:369:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    370:392:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1136:1158 -> a
+    370:392:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    370:392:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    370:392:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    393:407:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1157:1171 -> a
+    393:407:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    393:407:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    393:407:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    408:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1170:1184 -> a
+    408:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    408:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    408:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    423:428:java.lang.String acceptFieldNameOrIntegerForReturn():1721:1726 -> a
+    423:428:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    423:428:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    423:428:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    423:428:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    429:429:char peekCharAt(int):1519:1519 -> a
+    429:429:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    429:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    429:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    429:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    429:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    430:430:boolean eof(int):1468:1468 -> a
+    430:430:char peekCharAt(int):1519 -> a
+    430:430:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    430:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    430:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    430:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    430:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    431:432:char peekCharAt(int):1519:1520 -> a
+    431:432:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    431:432:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    431:432:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    431:432:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    431:432:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    433:445:java.lang.String acceptFieldNameOrIntegerForReturn():1730:1742 -> a
+    433:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    433:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    433:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    433:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    446:447:boolean isInteger(java.lang.String):1455:1456 -> a
+    446:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1187 -> a
+    446:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    446:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    446:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    448:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1188:1202 -> a
+    448:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    448:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    448:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1201:1201 -> a
+    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    464:476:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1199:1211 -> a
+    464:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    464:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    464:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    477:477:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1210:1210 -> a
+    477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
+    478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    478:478:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    479:481:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1212:1214 -> a
+    479:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    479:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    479:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    482:505:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1213:1236 -> a
+    482:505:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    482:505:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    482:505:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    506:506:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1008:1008 -> a
+    506:506:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    506:506:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     507:507:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    507:507:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):978 -> a
-    507:507:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    508:511:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):978:981 -> a
-    508:511:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    512:512:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949:949 -> a
-    512:512:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    513:514:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):925:926 -> a
-    513:514:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
-    513:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    507:507:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):994 -> a
+    507:507:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    508:511:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):994:997 -> a
+    508:511:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    512:512:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965:965 -> a
+    512:512:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    513:514:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):941:942 -> a
+    513:514:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965 -> a
+    513:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     515:517:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    515:517:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
-    515:517:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    518:527:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1227:1236 -> a
-    528:528:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1233:1233 -> a
-    529:550:java.nio.file.Path parseFileName(boolean):1304:1325 -> a
-    551:551:java.nio.file.Path parseFileName(boolean):1323:1323 -> a
-    552:572:java.lang.String replaceSystemPropertyReferences(java.lang.String):1270:1290 -> a
-    552:572:java.nio.file.Path parseFileName(boolean):1328 -> a
-    573:585:java.lang.String replaceSystemPropertyReferences(java.lang.String):1288:1300 -> a
-    573:585:java.nio.file.Path parseFileName(boolean):1328 -> a
-    586:586:java.nio.file.Path parseFileName(boolean):1330:1330 -> a
-    587:587:java.nio.file.Path parseFileName(boolean):1319:1319 -> a
-    588:588:java.nio.file.Path parseFileName(boolean):1308:1308 -> a
-    589:592:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1314:1317 -> a
-    593:593:boolean eof(int):1452:1452 -> a
-    594:595:boolean acceptChar(char):1474:1475 -> a
-    596:596:int remainingChars():1512:1512 -> a
-    596:596:boolean acceptString(java.lang.String):1522 -> a
-    597:605:boolean acceptString(java.lang.String):1522:1530 -> a
-    606:606:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1540:1540 -> a
-    607:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1578:1583 -> a
-    613:639:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1588:1614 -> a
-    640:641:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609:1610 -> a
+    515:517:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965 -> a
+    515:517:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    518:527:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1243:1252 -> a
+    528:528:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1249:1249 -> a
+    529:550:java.nio.file.Path parseFileName(boolean):1320:1341 -> a
+    551:551:java.nio.file.Path parseFileName(boolean):1339:1339 -> a
+    552:572:java.lang.String replaceSystemPropertyReferences(java.lang.String):1286:1306 -> a
+    552:572:java.nio.file.Path parseFileName(boolean):1344 -> a
+    573:585:java.lang.String replaceSystemPropertyReferences(java.lang.String):1304:1316 -> a
+    573:585:java.nio.file.Path parseFileName(boolean):1344 -> a
+    586:586:java.nio.file.Path parseFileName(boolean):1346:1346 -> a
+    587:587:java.nio.file.Path parseFileName(boolean):1335:1335 -> a
+    588:588:java.nio.file.Path parseFileName(boolean):1324:1324 -> a
+    589:592:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1330:1333 -> a
+    593:593:boolean eof(int):1468:1468 -> a
+    594:595:boolean acceptChar(char):1490:1491 -> a
+    596:596:int remainingChars():1528:1528 -> a
+    596:596:boolean acceptString(java.lang.String):1538 -> a
+    597:605:boolean acceptString(java.lang.String):1538:1546 -> a
+    606:606:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1556:1556 -> a
+    607:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1594:1599 -> a
+    613:639:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1604:1630 -> a
+    640:641:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625:1626 -> a
     642:644:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    642:644:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609 -> a
-    645:647:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617:1619 -> a
+    642:644:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625 -> a
+    645:647:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633:1635 -> a
     648:650:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    648:650:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617 -> a
-    651:657:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1623:1629 -> a
+    648:650:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633 -> a
+    651:657:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1639:1645 -> a
     658:660:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    658:660:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1628 -> a
-    661:704:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1640:1683 -> a
+    658:660:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1644 -> a
+    661:704:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1699 -> a
     705:707:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    705:707:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1679 -> a
-    708:708:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1673:1673 -> a
-    709:736:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1668:1695 -> a
+    705:707:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1695 -> a
+    708:708:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1689:1689 -> a
+    709:736:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1684:1711 -> a
     737:739:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    737:739:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1694 -> a
-    740:741:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1700:1701 -> a
-    742:744:boolean lambda$acceptPattern$7(java.lang.Integer):1757:1759 -> a
-    745:759:java.lang.String acceptString(java.util.function.Predicate):1763:1777 -> a
-    760:762:void parseClassFilter(java.util.function.Consumer):1809:1811 -> a
+    737:739:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1710 -> a
+    740:741:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1716:1717 -> a
+    742:744:boolean lambda$acceptPattern$7(java.lang.Integer):1773:1775 -> a
+    745:759:java.lang.String acceptString(java.util.function.Predicate):1779:1793 -> a
+    760:762:void parseClassFilter(java.util.function.Consumer):1825:1827 -> a
     763:763:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():105:105 -> a
-    763:763:void parseClassFilter(java.util.function.Consumer):1814 -> a
-    764:764:void parseClassFilter(java.util.function.Consumer):1814:1814 -> a
-    765:765:void parseClassFilter(java.util.function.Consumer):1813:1813 -> a
-    766:767:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1942 -> a
-    768:768:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1941 -> a
-    769:770:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1952 -> a
-    771:771:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1951 -> a
-    772:777:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1962 -> a
-    778:778:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> a
-    779:782:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1971:1974 -> a
-    783:784:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1987:1988 -> a
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):500:502 -> b
-    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):501:504 -> b
-    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):595:603 -> b
-    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):505 -> b
-    17:18:void expectChar(char):1516:1517 -> b
-    19:19:boolean lambda$acceptString$3(java.lang.Integer):1535:1535 -> b
-    20:24:java.lang.Integer acceptInteger():1548:1552 -> b
-    25:29:void parsePathFilter(java.util.function.Consumer):1862:1866 -> b
-    30:30:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921:1921 -> b
-    31:40:java.lang.String snippetForPosition():1897:1906 -> b
-    31:40:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921 -> b
-    41:47:java.lang.String snippetForPosition():1902:1908 -> b
-    41:47:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921 -> b
-    48:48:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921:1921 -> b
-    49:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1936:1937 -> b
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):481:488 -> c
-    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):487:487 -> c
-    10:11:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1947 -> c
-    10:11:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):495 -> c
-    12:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1946 -> c
-    12:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):495 -> c
-    13:15:boolean skipFlag(java.lang.String):543:545 -> c
-    16:20:void expectClosingQuote(char):1487:1491 -> c
-    21:21:void expectClosingQuote(char):1489:1489 -> c
-    22:28:boolean lambda$new$5(java.lang.Integer):1557:1563 -> c
-    29:29:java.lang.String acceptPattern():1755:1755 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):470:473 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):472:472 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):578:587 -> d
+    763:763:void parseClassFilter(java.util.function.Consumer):1830 -> a
+    764:764:void parseClassFilter(java.util.function.Consumer):1830:1830 -> a
+    765:765:void parseClassFilter(java.util.function.Consumer):1829:1829 -> a
+    766:767:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1958 -> a
+    768:768:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> a
+    769:770:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1968 -> a
+    771:771:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1967 -> a
+    772:777:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1978 -> a
+    778:778:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1973 -> a
+    779:782:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1987:1990 -> a
+    783:784:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2003:2004 -> a
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):505:507 -> b
+    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):506:509 -> b
+    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):600:608 -> b
+    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):510 -> b
+    17:18:void expectChar(char):1532:1533 -> b
+    19:19:boolean lambda$acceptString$3(java.lang.Integer):1551:1551 -> b
+    20:24:java.lang.Integer acceptInteger():1564:1568 -> b
+    25:29:void parsePathFilter(java.util.function.Consumer):1878:1882 -> b
+    30:30:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937:1937 -> b
+    31:40:java.lang.String snippetForPosition():1913:1922 -> b
+    31:40:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937 -> b
+    41:47:java.lang.String snippetForPosition():1918:1924 -> b
+    41:47:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937 -> b
+    48:48:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937:1937 -> b
+    49:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1952:1953 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):486:493 -> c
+    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):492:492 -> c
+    10:11:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1963 -> c
+    10:11:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):500 -> c
+    12:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1962 -> c
+    12:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):500 -> c
+    13:15:boolean skipFlag(java.lang.String):548:550 -> c
+    16:20:void expectClosingQuote(char):1503:1507 -> c
+    21:21:void expectClosingQuote(char):1505:1505 -> c
+    22:28:boolean lambda$new$5(java.lang.Integer):1573:1579 -> c
+    29:29:java.lang.String acceptPattern():1771:1771 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):475:478 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):477:477 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):583:592 -> d
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> d
-    16:18:boolean skipOptionWithClassSpec(java.lang.String):587 -> d
-    19:22:boolean hasNextChar(char):1456:1459 -> d
-    23:23:char acceptQuoteIfPresent():1483:1483 -> d
-    24:27:boolean hasNextChar(java.util.function.Predicate):1463:1466 -> d
-    24:27:char acceptQuoteIfPresent():1483 -> d
-    28:28:char readChar():1508:1508 -> d
-    28:28:char acceptQuoteIfPresent():1483 -> d
-    29:32:boolean lambda$new$6(java.lang.Integer):1567:1570 -> d
+    16:18:boolean skipOptionWithClassSpec(java.lang.String):592 -> d
+    19:22:boolean hasNextChar(char):1472:1475 -> d
+    23:23:char acceptQuoteIfPresent():1499:1499 -> d
+    24:27:boolean hasNextChar(java.util.function.Predicate):1479:1482 -> d
+    24:27:char acceptQuoteIfPresent():1499 -> d
+    28:28:char readChar():1524:1524 -> d
+    28:28:char acceptQuoteIfPresent():1499 -> d
+    29:32:boolean lambda$new$6(java.lang.Integer):1583:1586 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):564:570 -> e
-    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1372:1373 -> e
-    10:13:java.lang.String acceptQuotedOrUnquotedString():1539:1542 -> e
-    14:17:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1913:1916 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):553:557 -> f
-    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):611:611 -> f
-    7:7:java.lang.String acceptString():1535:1535 -> f
-    1:1:boolean eof():1448:1448 -> g
-    2:5:void unacceptString(java.lang.String):1781:1784 -> g
-    6:6:boolean pathFilterMatcher(java.lang.Integer):1857:1857 -> g
-    1:1:com.android.tools.r8.position.TextPosition getPosition():1979:1979 -> h
-    2:2:int getColumn():1983:1983 -> h
-    2:2:com.android.tools.r8.position.TextPosition getPosition():1979 -> h
-    3:3:com.android.tools.r8.position.TextPosition getPosition():1979:1979 -> h
-    1:1:boolean isOptionalArgumentGiven():1470:1470 -> i
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():870:882 -> j
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():881:881 -> j
-    1:12:java.util.List parseArgumentList():1242:1253 -> k
-    13:22:java.util.List parseArgumentList():1250:1259 -> k
-    23:25:java.util.List parseArgumentList():1258:1260 -> k
-    26:33:java.util.List parseArgumentList():1257:1264 -> k
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1848:1849 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1841 -> l
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1842:1843 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1851:1851 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1841 -> l
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):569:575 -> e
+    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1388:1389 -> e
+    10:13:java.lang.String acceptQuotedOrUnquotedString():1555:1558 -> e
+    14:17:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1929:1932 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):558:562 -> f
+    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):616:616 -> f
+    7:7:java.lang.String acceptString():1551:1551 -> f
+    1:1:boolean eof():1464:1464 -> g
+    2:5:void unacceptString(java.lang.String):1797:1800 -> g
+    6:6:boolean pathFilterMatcher(java.lang.Integer):1873:1873 -> g
+    1:1:com.android.tools.r8.position.TextPosition getPosition():1995:1995 -> h
+    2:2:int getColumn():1999:1999 -> h
+    2:2:com.android.tools.r8.position.TextPosition getPosition():1995 -> h
+    3:3:com.android.tools.r8.position.TextPosition getPosition():1995:1995 -> h
+    1:1:boolean isOptionalArgumentGiven():1486:1486 -> i
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():886:898 -> j
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():897:897 -> j
+    1:12:java.util.List parseArgumentList():1258:1269 -> k
+    13:22:java.util.List parseArgumentList():1266:1275 -> k
+    23:25:java.util.List parseArgumentList():1274:1276 -> k
+    26:33:java.util.List parseArgumentList():1273:1280 -> k
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1864:1865 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1857 -> l
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1858:1859 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1867:1867 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1857 -> l
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder com.android.tools.r8.shaking.ProguardClassNameList.builder():24:24 -> m
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1828 -> m
-    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1848:1849 -> m
-    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1820 -> m
-    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1821:1823 -> m
-    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1821:1824 -> m
-    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1831:1832 -> m
-    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1851:1851 -> m
-    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1820 -> m
-    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    1:10:java.util.List parseClassPath():1334:1343 -> n
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1349:1362 -> o
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1359:1364 -> o
-    1:7:java.lang.String parseFileFilter():1369:1375 -> p
-    1:10:void parseInclude():509:518 -> q
-    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1931:1932 -> q
-    11:12:void parseInclude():518 -> q
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1844 -> m
+    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1864:1865 -> m
+    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1836 -> m
+    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1837:1839 -> m
+    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1837:1840 -> m
+    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1847:1848 -> m
+    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1867:1867 -> m
+    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1836 -> m
+    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    1:10:java.util.List parseClassPath():1350:1359 -> n
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1365:1378 -> o
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1375:1380 -> o
+    1:7:java.lang.String parseFileFilter():1385:1391 -> p
+    1:10:void parseInclude():514:523 -> q
+    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1947:1948 -> q
+    11:12:void parseInclude():523 -> q
     13:14:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> q
-    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1932 -> q
-    13:14:void parseInclude():518 -> q
-    15:15:void parseInclude():518:518 -> q
-    16:16:void parseInclude():515:515 -> q
-    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1931:1932 -> q
-    17:18:void parseInclude():515 -> q
+    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1948 -> q
+    13:14:void parseInclude():523 -> q
+    15:15:void parseInclude():523:523 -> q
+    16:16:void parseInclude():520:520 -> q
+    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1947:1948 -> q
+    17:18:void parseInclude():520 -> q
     19:20:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> q
-    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1932 -> q
-    19:20:void parseInclude():515 -> q
-    21:21:void parseInclude():515:515 -> q
+    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1948 -> q
+    19:20:void parseInclude():520 -> q
+    21:21:void parseInclude():520:520 -> q
     1:1:boolean parseOption():223:223 -> r
-    2:2:int remainingChars():1512:1512 -> r
-    2:2:boolean acceptArobaseInclude():524 -> r
+    2:2:int remainingChars():1528:1528 -> r
+    2:2:boolean acceptArobaseInclude():529 -> r
     2:2:boolean parseOption():226 -> r
-    3:6:boolean acceptArobaseInclude():527:530 -> r
+    3:6:boolean acceptArobaseInclude():532:535 -> r
     3:6:boolean parseOption():226 -> r
     7:10:boolean parseOption():229:232 -> r
     11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):408:409 -> r
     11:12:boolean parseOption():233 -> r
-    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1395 -> r
+    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1411 -> r
     13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     13:13:boolean parseOption():233 -> r
     14:15:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    14:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395 -> r
+    14:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411 -> r
     14:15:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     14:15:boolean parseOption():233 -> r
-    16:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1395 -> r
+    16:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1411 -> r
     16:16:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     16:16:boolean parseOption():233 -> r
     17:18:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    17:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395 -> r
+    17:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411 -> r
     17:18:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     17:18:boolean parseOption():233 -> r
-    19:22:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1398 -> r
+    19:22:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1414 -> r
     19:22:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     19:22:boolean parseOption():233 -> r
     23:23:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    23:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1398 -> r
+    23:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1414 -> r
     23:23:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     23:23:boolean parseOption():233 -> r
     24:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1399 -> r
+    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1415 -> r
     24:24:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     24:24:boolean parseOption():233 -> r
     25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> r
-    25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1400 -> r
+    25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1416 -> r
     25:27:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     25:27:boolean parseOption():233 -> r
     28:28:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):412:412 -> r
@@ -58825,33 +59108,33 @@
     36:36:boolean parseOption():233 -> r
     37:37:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):423:423 -> r
     37:37:boolean parseOption():233 -> r
-    38:38:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:755 -> r
+    38:38:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:760 -> r
     38:38:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     38:38:boolean parseOption():233 -> r
     39:40:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    39:40:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755 -> r
+    39:40:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
     39:40:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     39:40:boolean parseOption():233 -> r
-    41:41:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:755 -> r
+    41:41:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:760 -> r
     41:41:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     41:41:boolean parseOption():233 -> r
     42:43:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    42:43:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755 -> r
+    42:43:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
     42:43:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     42:43:boolean parseOption():233 -> r
-    44:47:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:758 -> r
+    44:47:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:763 -> r
     44:47:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     44:47:boolean parseOption():233 -> r
     48:48:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):758 -> r
+    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):763 -> r
     48:48:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     48:48:boolean parseOption():233 -> r
     49:49:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):759 -> r
+    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):764 -> r
     49:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     49:49:boolean parseOption():233 -> r
     50:52:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> r
-    50:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
+    50:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):765 -> r
     50:52:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     50:52:boolean parseOption():233 -> r
     53:53:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):425:425 -> r
@@ -58861,33 +59144,33 @@
     54:54:boolean parseOption():233 -> r
     55:55:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):428:428 -> r
     55:55:boolean parseOption():233 -> r
-    56:56:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:766 -> r
+    56:56:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:771 -> r
     56:56:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     56:56:boolean parseOption():233 -> r
     57:58:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    57:58:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766 -> r
+    57:58:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
     57:58:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     57:58:boolean parseOption():233 -> r
-    59:59:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:766 -> r
+    59:59:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:771 -> r
     59:59:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     59:59:boolean parseOption():233 -> r
     60:61:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    60:61:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766 -> r
+    60:61:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
     60:61:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     60:61:boolean parseOption():233 -> r
-    62:65:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:769 -> r
+    62:65:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:774 -> r
     62:65:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     62:65:boolean parseOption():233 -> r
     66:66:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    66:66:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):769 -> r
+    66:66:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):774 -> r
     66:66:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     66:66:boolean parseOption():233 -> r
     67:67:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    67:67:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):770 -> r
+    67:67:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):775 -> r
     67:67:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     67:67:boolean parseOption():233 -> r
     68:70:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> r
-    68:70:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
+    68:70:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):776 -> r
     68:70:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     68:70:boolean parseOption():233 -> r
     71:71:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):430:430 -> r
@@ -58897,40 +59180,40 @@
     72:72:boolean parseOption():233 -> r
     73:74:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):433:434 -> r
     73:74:boolean parseOption():233 -> r
-    75:75:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    75:75:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     75:75:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     75:75:boolean parseOption():233 -> r
     76:77:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    76:77:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    76:77:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     76:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     76:77:boolean parseOption():233 -> r
-    78:78:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    78:78:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     78:78:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     78:78:boolean parseOption():233 -> r
     79:80:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    79:80:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    79:80:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     79:80:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     79:80:boolean parseOption():233 -> r
-    81:81:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    81:81:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     81:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     81:81:boolean parseOption():233 -> r
     82:82:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> r
-    82:82:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    82:82:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     82:82:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     82:82:boolean parseOption():233 -> r
-    83:85:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):672:674 -> r
+    83:85:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):677:679 -> r
     83:85:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     83:85:boolean parseOption():233 -> r
     86:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    86:86:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):674 -> r
+    86:86:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):679 -> r
     86:86:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     86:86:boolean parseOption():233 -> r
     87:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    87:87:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):675 -> r
+    87:87:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):680 -> r
     87:87:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     87:87:boolean parseOption():233 -> r
     88:90:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> r
-    88:90:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
+    88:90:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):681 -> r
     88:90:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     88:90:boolean parseOption():233 -> r
     91:91:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435:435 -> r
@@ -58945,40 +59228,40 @@
     96:96:boolean parseOption():233 -> r
     97:98:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):443:444 -> r
     97:98:boolean parseOption():233 -> r
-    99:99:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    99:99:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     99:99:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     99:99:boolean parseOption():233 -> r
     100:101:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    100:101:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    100:101:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     100:101:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     100:101:boolean parseOption():233 -> r
-    102:102:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    102:102:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     102:102:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     102:102:boolean parseOption():233 -> r
     103:104:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    103:104:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    103:104:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     103:104:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     103:104:boolean parseOption():233 -> r
-    105:105:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    105:105:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     105:105:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     105:105:boolean parseOption():233 -> r
     106:106:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> r
-    106:106:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    106:106:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     106:106:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     106:106:boolean parseOption():233 -> r
-    107:109:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):683:685 -> r
+    107:109:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):688:690 -> r
     107:109:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     107:109:boolean parseOption():233 -> r
     110:110:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    110:110:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):685 -> r
+    110:110:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):690 -> r
     110:110:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     110:110:boolean parseOption():233 -> r
     111:111:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    111:111:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):686 -> r
+    111:111:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):691 -> r
     111:111:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     111:111:boolean parseOption():233 -> r
     112:112:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> r
-    112:112:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
+    112:112:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):692 -> r
     112:112:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     112:112:boolean parseOption():233 -> r
     113:113:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445:445 -> r
@@ -58988,40 +59271,40 @@
     114:114:boolean parseOption():233 -> r
     115:116:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448:449 -> r
     115:116:boolean parseOption():233 -> r
-    117:117:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    117:117:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     117:117:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     117:117:boolean parseOption():233 -> r
     118:119:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    118:119:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    118:119:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     118:119:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     118:119:boolean parseOption():233 -> r
-    120:120:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    120:120:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     120:120:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     120:120:boolean parseOption():233 -> r
     121:122:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    121:122:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    121:122:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     121:122:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     121:122:boolean parseOption():233 -> r
-    123:123:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    123:123:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     123:123:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     123:123:boolean parseOption():233 -> r
     124:124:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> r
-    124:124:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    124:124:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     124:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     124:124:boolean parseOption():233 -> r
-    125:127:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):695:697 -> r
+    125:127:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):700:702 -> r
     125:127:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     125:127:boolean parseOption():233 -> r
     128:128:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    128:128:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):697 -> r
+    128:128:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):702 -> r
     128:128:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     128:128:boolean parseOption():233 -> r
     129:129:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    129:129:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):698 -> r
+    129:129:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):703 -> r
     129:129:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     129:129:boolean parseOption():233 -> r
     130:130:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> r
-    130:130:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
+    130:130:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):704 -> r
     130:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     130:130:boolean parseOption():233 -> r
     131:131:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):451:451 -> r
@@ -59029,221 +59312,257 @@
     132:132:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
     132:132:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):451 -> r
     132:132:boolean parseOption():233 -> r
-    133:142:boolean parseOption():234:243 -> r
-    143:162:java.util.List acceptPatternList():1730:1749 -> r
-    143:162:void parseKeepAttributes():535 -> r
-    143:162:boolean parseOption():244 -> r
-    163:166:void parseKeepAttributes():536:539 -> r
-    163:166:boolean parseOption():244 -> r
-    167:167:void parseKeepAttributes():537:537 -> r
-    167:167:boolean parseOption():244 -> r
-    168:169:boolean parseOption():245:246 -> r
-    170:179:void parsePackageFilter(java.util.function.BiConsumer):1790:1799 -> r
-    170:179:boolean parseOption():246 -> r
-    180:183:void parsePackageFilter(java.util.function.BiConsumer):1798:1801 -> r
-    180:183:boolean parseOption():246 -> r
-    184:191:void parsePackageFilter(java.util.function.BiConsumer):1796:1803 -> r
-    184:191:boolean parseOption():246 -> r
-    192:194:boolean parseOption():247:249 -> r
-    195:195:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):658:658 -> r
-    195:195:boolean parseOption():250 -> r
-    196:197:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    196:197:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):659 -> r
-    196:197:boolean parseOption():250 -> r
-    198:198:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):659:659 -> r
-    198:198:boolean parseOption():250 -> r
-    199:200:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    199:200:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):660 -> r
-    199:200:boolean parseOption():250 -> r
-    201:204:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):660:663 -> r
-    201:204:boolean parseOption():250 -> r
-    205:205:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    205:205:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):663 -> r
-    205:205:boolean parseOption():250 -> r
-    206:206:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    206:206:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664 -> r
-    206:206:boolean parseOption():250 -> r
-    207:207:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665:665 -> r
-    207:207:boolean parseOption():250 -> r
-    208:208:boolean parseOption():251:251 -> r
-    209:209:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    209:209:boolean parseOption():251 -> r
-    210:215:boolean parseOption():252:257 -> r
-    216:216:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    216:216:boolean parseOption():257 -> r
-    217:217:boolean parseOption():258:258 -> r
-    218:218:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):646:646 -> r
-    218:218:boolean parseOption():259 -> r
-    219:220:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    219:220:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):647 -> r
-    219:220:boolean parseOption():259 -> r
-    221:221:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):647:647 -> r
-    221:221:boolean parseOption():259 -> r
-    222:223:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    222:223:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):648 -> r
-    222:223:boolean parseOption():259 -> r
-    224:227:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):648:651 -> r
-    224:227:boolean parseOption():259 -> r
-    228:228:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    228:228:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):651 -> r
-    228:228:boolean parseOption():259 -> r
-    229:229:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    229:229:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652 -> r
-    229:229:boolean parseOption():259 -> r
-    230:230:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> r
-    230:230:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653 -> r
-    230:230:boolean parseOption():259 -> r
-    231:231:boolean parseOption():260:260 -> r
-    232:232:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    232:232:boolean parseOption():260 -> r
-    233:242:boolean parseOption():261:270 -> r
-    243:244:boolean parseOption():267:268 -> r
-    245:247:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    245:247:boolean parseOption():267 -> r
-    248:321:boolean parseOption():271:344 -> r
-    322:322:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1382:1382 -> r
-    322:322:boolean parseOption():345 -> r
-    323:324:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    323:324:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1383 -> r
-    323:324:boolean parseOption():345 -> r
-    325:325:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1383:1383 -> r
-    325:325:boolean parseOption():345 -> r
-    326:327:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    326:327:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1384 -> r
-    326:327:boolean parseOption():345 -> r
-    328:331:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1384:1387 -> r
-    328:331:boolean parseOption():345 -> r
-    332:332:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    332:332:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1387 -> r
-    332:332:boolean parseOption():345 -> r
-    333:333:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    333:333:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1388 -> r
-    333:333:boolean parseOption():345 -> r
-    334:334:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1389:1389 -> r
-    334:334:boolean parseOption():345 -> r
-    335:335:boolean parseOption():346:346 -> r
-    336:336:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    336:336:boolean parseOption():346 -> r
-    337:337:boolean parseOption():347:347 -> r
-    338:338:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1405:1405 -> r
-    338:338:boolean parseOption():348 -> r
-    339:340:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    339:340:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1406 -> r
-    339:340:boolean parseOption():348 -> r
-    341:341:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1406:1406 -> r
-    341:341:boolean parseOption():348 -> r
-    342:343:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    342:343:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1407 -> r
-    342:343:boolean parseOption():348 -> r
-    344:347:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1407:1410 -> r
-    344:347:boolean parseOption():348 -> r
-    348:348:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    348:348:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1410 -> r
-    348:348:boolean parseOption():348 -> r
-    349:349:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    349:349:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1411 -> r
-    349:349:boolean parseOption():348 -> r
-    350:350:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:26 -> r
-    350:350:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1412 -> r
-    350:350:boolean parseOption():348 -> r
-    351:351:boolean parseOption():349:349 -> r
-    352:352:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    352:352:boolean parseOption():349 -> r
-    353:356:boolean parseOption():350:353 -> r
-    357:383:boolean parseOption():352:378 -> r
-    384:384:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    384:384:boolean parseOption():378 -> r
-    385:392:boolean parseOption():379:386 -> r
-    393:393:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):718:718 -> r
-    393:393:boolean parseOption():386 -> r
-    394:395:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    394:395:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):719 -> r
-    394:395:boolean parseOption():386 -> r
-    396:396:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):719:719 -> r
-    396:396:boolean parseOption():386 -> r
-    397:398:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    397:398:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):720 -> r
-    397:398:boolean parseOption():386 -> r
-    399:402:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):720:723 -> r
-    399:402:boolean parseOption():386 -> r
-    403:403:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    403:403:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):723 -> r
-    403:403:boolean parseOption():386 -> r
-    404:404:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    404:404:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724 -> r
-    404:404:boolean parseOption():386 -> r
-    405:405:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> r
-    405:405:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725 -> r
-    405:405:boolean parseOption():386 -> r
-    406:406:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    406:406:boolean parseOption():386 -> r
-    407:408:boolean parseOption():387:388 -> r
-    409:409:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):730:730 -> r
-    409:409:boolean parseOption():388 -> r
-    410:411:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    410:411:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):731 -> r
-    410:411:boolean parseOption():388 -> r
-    412:412:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):731:731 -> r
-    412:412:boolean parseOption():388 -> r
-    413:414:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    413:414:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):732 -> r
-    413:414:boolean parseOption():388 -> r
-    415:422:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):732:739 -> r
-    415:422:boolean parseOption():388 -> r
-    423:423:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):47:47 -> r
-    423:423:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):740 -> r
-    423:423:boolean parseOption():388 -> r
-    424:425:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):741:742 -> r
-    424:425:boolean parseOption():388 -> r
-    426:426:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    426:426:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):742 -> r
-    426:426:boolean parseOption():388 -> r
-    427:427:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    427:427:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):743 -> r
+    133:133:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):454:454 -> r
+    133:133:boolean parseOption():233 -> r
+    134:134:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:782 -> r
+    134:134:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    134:134:boolean parseOption():233 -> r
+    135:136:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    135:136:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782 -> r
+    135:136:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    135:136:boolean parseOption():233 -> r
+    137:137:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:782 -> r
+    137:137:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    137:137:boolean parseOption():233 -> r
+    138:139:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    138:139:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782 -> r
+    138:139:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    138:139:boolean parseOption():233 -> r
+    140:143:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:785 -> r
+    140:143:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    140:143:boolean parseOption():233 -> r
+    144:144:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    144:144:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):785 -> r
+    144:144:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    144:144:boolean parseOption():233 -> r
+    145:145:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    145:145:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):786 -> r
+    145:145:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    145:145:boolean parseOption():233 -> r
+    146:148:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:28 -> r
+    146:148:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):787 -> r
+    146:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    146:148:boolean parseOption():233 -> r
+    149:149:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):456:456 -> r
+    149:149:boolean parseOption():233 -> r
+    150:150:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    150:150:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):456 -> r
+    150:150:boolean parseOption():233 -> r
+    151:160:boolean parseOption():234:243 -> r
+    161:180:java.util.List acceptPatternList():1746:1765 -> r
+    161:180:void parseKeepAttributes():540 -> r
+    161:180:boolean parseOption():244 -> r
+    181:184:void parseKeepAttributes():541:544 -> r
+    181:184:boolean parseOption():244 -> r
+    185:185:void parseKeepAttributes():542:542 -> r
+    185:185:boolean parseOption():244 -> r
+    186:187:boolean parseOption():245:246 -> r
+    188:197:void parsePackageFilter(java.util.function.BiConsumer):1806:1815 -> r
+    188:197:boolean parseOption():246 -> r
+    198:201:void parsePackageFilter(java.util.function.BiConsumer):1814:1817 -> r
+    198:201:boolean parseOption():246 -> r
+    202:209:void parsePackageFilter(java.util.function.BiConsumer):1812:1819 -> r
+    202:209:boolean parseOption():246 -> r
+    210:212:boolean parseOption():247:249 -> r
+    213:213:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):663:663 -> r
+    213:213:boolean parseOption():250 -> r
+    214:215:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    214:215:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664 -> r
+    214:215:boolean parseOption():250 -> r
+    216:216:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664:664 -> r
+    216:216:boolean parseOption():250 -> r
+    217:218:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    217:218:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665 -> r
+    217:218:boolean parseOption():250 -> r
+    219:222:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665:668 -> r
+    219:222:boolean parseOption():250 -> r
+    223:223:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    223:223:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):668 -> r
+    223:223:boolean parseOption():250 -> r
+    224:224:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    224:224:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):669 -> r
+    224:224:boolean parseOption():250 -> r
+    225:225:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):670:670 -> r
+    225:225:boolean parseOption():250 -> r
+    226:226:boolean parseOption():251:251 -> r
+    227:227:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    227:227:boolean parseOption():251 -> r
+    228:233:boolean parseOption():252:257 -> r
+    234:234:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    234:234:boolean parseOption():257 -> r
+    235:235:boolean parseOption():258:258 -> r
+    236:236:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):651:651 -> r
+    236:236:boolean parseOption():259 -> r
+    237:238:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    237:238:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652 -> r
+    237:238:boolean parseOption():259 -> r
+    239:239:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652:652 -> r
+    239:239:boolean parseOption():259 -> r
+    240:241:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    240:241:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653 -> r
+    240:241:boolean parseOption():259 -> r
+    242:245:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653:656 -> r
+    242:245:boolean parseOption():259 -> r
+    246:246:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    246:246:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):656 -> r
+    246:246:boolean parseOption():259 -> r
+    247:247:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    247:247:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):657 -> r
+    247:247:boolean parseOption():259 -> r
+    248:248:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> r
+    248:248:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):658 -> r
+    248:248:boolean parseOption():259 -> r
+    249:249:boolean parseOption():260:260 -> r
+    250:250:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    250:250:boolean parseOption():260 -> r
+    251:260:boolean parseOption():261:270 -> r
+    261:262:boolean parseOption():267:268 -> r
+    263:265:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    263:265:boolean parseOption():267 -> r
+    266:339:boolean parseOption():271:344 -> r
+    340:340:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1398:1398 -> r
+    340:340:boolean parseOption():345 -> r
+    341:342:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    341:342:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1399 -> r
+    341:342:boolean parseOption():345 -> r
+    343:343:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1399:1399 -> r
+    343:343:boolean parseOption():345 -> r
+    344:345:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    344:345:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1400 -> r
+    344:345:boolean parseOption():345 -> r
+    346:349:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1400:1403 -> r
+    346:349:boolean parseOption():345 -> r
+    350:350:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    350:350:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1403 -> r
+    350:350:boolean parseOption():345 -> r
+    351:351:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    351:351:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1404 -> r
+    351:351:boolean parseOption():345 -> r
+    352:352:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1405:1405 -> r
+    352:352:boolean parseOption():345 -> r
+    353:353:boolean parseOption():346:346 -> r
+    354:354:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    354:354:boolean parseOption():346 -> r
+    355:355:boolean parseOption():347:347 -> r
+    356:356:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1421:1421 -> r
+    356:356:boolean parseOption():348 -> r
+    357:358:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    357:358:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1422 -> r
+    357:358:boolean parseOption():348 -> r
+    359:359:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1422:1422 -> r
+    359:359:boolean parseOption():348 -> r
+    360:361:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    360:361:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1423 -> r
+    360:361:boolean parseOption():348 -> r
+    362:365:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1423:1426 -> r
+    362:365:boolean parseOption():348 -> r
+    366:366:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    366:366:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1426 -> r
+    366:366:boolean parseOption():348 -> r
+    367:367:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    367:367:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1427 -> r
+    367:367:boolean parseOption():348 -> r
+    368:368:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:26 -> r
+    368:368:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1428 -> r
+    368:368:boolean parseOption():348 -> r
+    369:369:boolean parseOption():349:349 -> r
+    370:370:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    370:370:boolean parseOption():349 -> r
+    371:374:boolean parseOption():350:353 -> r
+    375:401:boolean parseOption():352:378 -> r
+    402:402:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    402:402:boolean parseOption():378 -> r
+    403:410:boolean parseOption():379:386 -> r
+    411:411:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):723:723 -> r
+    411:411:boolean parseOption():386 -> r
+    412:413:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    412:413:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724 -> r
+    412:413:boolean parseOption():386 -> r
+    414:414:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724:724 -> r
+    414:414:boolean parseOption():386 -> r
+    415:416:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    415:416:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725 -> r
+    415:416:boolean parseOption():386 -> r
+    417:420:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725:728 -> r
+    417:420:boolean parseOption():386 -> r
+    421:421:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    421:421:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):728 -> r
+    421:421:boolean parseOption():386 -> r
+    422:422:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    422:422:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):729 -> r
+    422:422:boolean parseOption():386 -> r
+    423:423:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> r
+    423:423:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):730 -> r
+    423:423:boolean parseOption():386 -> r
+    424:424:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    424:424:boolean parseOption():386 -> r
+    425:426:boolean parseOption():387:388 -> r
+    427:427:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):735:735 -> r
     427:427:boolean parseOption():388 -> r
-    428:431:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():52:55 -> r
-    428:431:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):744 -> r
-    428:431:boolean parseOption():388 -> r
-    432:432:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745:745 -> r
-    432:432:boolean parseOption():388 -> r
-    433:445:void verifyAndLinkBackReferences(java.lang.Iterable):775:787 -> r
-    433:445:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    433:445:boolean parseOption():388 -> r
-    446:446:void com.android.tools.r8.shaking.ProguardWildcard$BackReference.setReference(com.android.tools.r8.shaking.ProguardWildcard$Pattern):90:90 -> r
-    446:446:void verifyAndLinkBackReferences(java.lang.Iterable):787 -> r
-    446:446:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    446:446:boolean parseOption():388 -> r
-    447:450:void verifyAndLinkBackReferences(java.lang.Iterable):782:785 -> r
-    447:450:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    447:450:boolean parseOption():388 -> r
-    451:453:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    451:453:void verifyAndLinkBackReferences(java.lang.Iterable):782 -> r
-    451:453:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    451:453:boolean parseOption():388 -> r
-    454:456:void verifyAndLinkBackReferences(java.lang.Iterable):789:791 -> r
-    454:456:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    454:456:boolean parseOption():388 -> r
-    457:457:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    457:457:boolean parseOption():388 -> r
-    458:459:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748:749 -> r
-    458:459:boolean parseOption():388 -> r
-    460:462:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    460:462:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748 -> r
-    460:462:boolean parseOption():388 -> r
-    463:475:boolean parseOption():389:401 -> r
-    1:1:java.lang.String acceptClassName():1573:1573 -> s
-    1:1:java.lang.String parsePackageNameOrEmptyString():1836 -> s
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1871:1890 -> t
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1892 -> t
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1877:1877 -> t
-    1:1:char peekChar():1499:1499 -> u
-    1:4:void skipOptimizationName():608:611 -> v
-    1:2:void skipSingleArgument():615:616 -> w
-    3:3:char readChar():1508:1508 -> w
-    3:3:void skipSingleArgument():617 -> w
-    1:6:void skipWhitespace():1416:1421 -> x
-    7:14:void skipComment():1427:1434 -> x
-    7:14:void skipWhitespace():1423 -> x
+    428:429:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    428:429:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):736 -> r
+    428:429:boolean parseOption():388 -> r
+    430:430:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):736:736 -> r
+    430:430:boolean parseOption():388 -> r
+    431:432:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    431:432:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):737 -> r
+    431:432:boolean parseOption():388 -> r
+    433:440:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):737:744 -> r
+    433:440:boolean parseOption():388 -> r
+    441:441:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):47:47 -> r
+    441:441:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
+    441:441:boolean parseOption():388 -> r
+    442:443:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):746:747 -> r
+    442:443:boolean parseOption():388 -> r
+    444:444:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    444:444:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):747 -> r
+    444:444:boolean parseOption():388 -> r
+    445:445:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    445:445:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748 -> r
+    445:445:boolean parseOption():388 -> r
+    446:449:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():52:55 -> r
+    446:449:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):749 -> r
+    446:449:boolean parseOption():388 -> r
+    450:450:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750:750 -> r
+    450:450:boolean parseOption():388 -> r
+    451:463:void verifyAndLinkBackReferences(java.lang.Iterable):791:803 -> r
+    451:463:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    451:463:boolean parseOption():388 -> r
+    464:464:void com.android.tools.r8.shaking.ProguardWildcard$BackReference.setReference(com.android.tools.r8.shaking.ProguardWildcard$Pattern):90:90 -> r
+    464:464:void verifyAndLinkBackReferences(java.lang.Iterable):803 -> r
+    464:464:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    464:464:boolean parseOption():388 -> r
+    465:468:void verifyAndLinkBackReferences(java.lang.Iterable):798:801 -> r
+    465:468:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    465:468:boolean parseOption():388 -> r
+    469:471:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    469:471:void verifyAndLinkBackReferences(java.lang.Iterable):798 -> r
+    469:471:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    469:471:boolean parseOption():388 -> r
+    472:474:void verifyAndLinkBackReferences(java.lang.Iterable):805:807 -> r
+    472:474:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    472:474:boolean parseOption():388 -> r
+    475:475:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    475:475:boolean parseOption():388 -> r
+    476:477:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):753:754 -> r
+    476:477:boolean parseOption():388 -> r
+    478:480:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    478:480:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):753 -> r
+    478:480:boolean parseOption():388 -> r
+    481:493:boolean parseOption():389:401 -> r
+    1:1:java.lang.String acceptClassName():1589:1589 -> s
+    1:1:java.lang.String parsePackageNameOrEmptyString():1852 -> s
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1906 -> t
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1903:1908 -> t
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1893:1893 -> t
+    1:1:char peekChar():1515:1515 -> u
+    1:4:void skipOptimizationName():613:616 -> v
+    1:2:void skipSingleArgument():620:621 -> w
+    3:3:char readChar():1524:1524 -> w
+    3:3:void skipSingleArgument():622 -> w
+    1:6:void skipWhitespace():1432:1437 -> x
+    7:14:void skipComment():1443:1450 -> x
+    7:14:void skipWhitespace():1439 -> x
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.g1:
     boolean used -> o
     boolean $assertionsDisabled -> p
@@ -59300,7 +59619,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -59317,7 +59636,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -59706,7 +60025,7 @@
     1:1:boolean access$100(java.lang.String,int,java.lang.String,int,java.util.List,int):14:14 -> a
     2:2:java.lang.Iterable getWildcards():93:93 -> a
     3:3:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2018:2018 -> a
+    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2034:2034 -> a
     4:4:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
     5:9:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
     com.android.tools.r8.shaking.ProguardNameMatcher materialize() -> b
@@ -59849,7 +60168,7 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
@@ -59947,7 +60266,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60011,173 +60330,176 @@
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
 com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.v2:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Map mayHaveSideEffects -> s
-    java.util.Set ifRules -> y
+    java.util.Set identifierNameStrings -> w
+    java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> y
     java.lang.Iterable rules -> c
     java.util.LinkedHashMap reasonAsked -> g
-    java.util.Map assumedValues -> u
+    java.util.Map noSideEffects -> u
     com.android.tools.r8.graph.DirectMappedDexApplication application -> b
     java.util.Set alwaysInline -> i
     java.util.Set noOptimization -> e
-    java.util.Set neverMerge -> o
-    com.android.tools.r8.utils.InternalOptions options -> w
+    java.util.Set neverClassInline -> o
+    java.util.Set neverPropagateValue -> q
+    boolean $assertionsDisabled -> A
     java.util.Set neverInline -> k
-    java.util.Set keepUnusedArguments -> m
-    java.util.Map dependentKeepClassCompatRule -> r
-    java.util.Map noSideEffects -> t
-    java.util.Set identifierNameStrings -> v
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> x
+    java.util.Set keepParametersWithConstantValue -> m
+    java.util.Map dependentNoShrinking -> r
+    java.util.Map mayHaveSideEffects -> t
+    java.util.Set ifRules -> z
     java.util.LinkedHashMap checkDiscarded -> h
+    java.util.Map assumedValues -> v
     java.util.Map noShrinking -> d
     java.util.Set forceInline -> j
-    boolean $assertionsDisabled -> z
     java.util.Set noObfuscation -> f
-    java.util.Set neverPropagateValue -> p
-    java.util.Set keepParametersWithConstantValue -> l
-    java.util.Set neverClassInline -> n
+    java.util.Set neverMerge -> p
+    com.android.tools.r8.utils.InternalOptions options -> x
+    java.util.Set whyAreYouNotInlining -> l
+    java.util.Set keepUnusedArguments -> n
     1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):96:96 -> <init>
-    2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:100 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):97:97 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:101 -> <init>
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:243 -> a
-    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):242:242 -> a
-    18:23:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):246:251 -> a
-    24:51:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):258:285 -> a
-    52:52:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):274:274 -> a
-    53:64:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):304:315 -> a
-    65:96:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):325:356 -> a
-    97:97:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():361:361 -> a
-    98:107:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):378:387 -> a
-    108:109: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):411:412 -> a
-    110:134: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):434:458 -> a
-    135:136: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):470:471 -> a
-    137:145: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):483:491 -> a
-    146:146: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):501:501 -> a
-    147:148: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):503:504 -> a
-    149:150:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):566:567 -> a
-    151:151:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583:583 -> a
-    151:151:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    152:161:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):593:602 -> a
-    152:161:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    152:161:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    162:162:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> a
-    162:162:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):602 -> a
-    162:162:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    162:162:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    163:163:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):605:605 -> a
-    163:163:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    163:163:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    164:164:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):588:588 -> a
-    164:164:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    165:170:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):611:616 -> a
-    165:170:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):579 -> a
-    171:176:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):657:662 -> a
-    177:177:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):661:661 -> a
-    178:178:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):667:667 -> a
-    179:182:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):680:683 -> a
-    179:182:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):668 -> a
-    183:183:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):698:698 -> a
-    184:184:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():18:18 -> a
-    184:184:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):698 -> a
-    185:186:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):699:700 -> a
-    187:191:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):713:717 -> a
-    192:192:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):725:725 -> a
-    193:197:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):733:737 -> a
-    198:205: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):752:759 -> a
-    206:206:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    206:206: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):759 -> a
-    207:209: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):763:765 -> a
-    210:213: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):776:779 -> a
-    214:214:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    214:214: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):779 -> a
-    215:215: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):782:782 -> a
-    216:216:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):788:788 -> a
-    217:217:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    217:217:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):789 -> a
-    218:218:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):791:791 -> a
-    219:238:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):795:814 -> a
-    239:240:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():814:815 -> a
-    239:240:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):511 -> a
-    241:252:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):511:522 -> a
-    253:253:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    253:253:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):524 -> a
-    254:254:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):524:524 -> a
-    255:280:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):519:544 -> a
-    281:281:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    281:281:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):544 -> a
-    282:282:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):544:544 -> a
-    283:298:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):543:558 -> a
-    299:319: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):838:858 -> a
-    320:320:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    320:320: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):858 -> a
-    321:330:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):864:873 -> a
-    331:352:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):870:891 -> a
-    353:353:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    353:353: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):891 -> a
-    354:378: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):891:915 -> a
-    379:389:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):818:828 -> a
-    379:389: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):916 -> a
-    390:420: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):917:947 -> a
-    421:421: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):941:941 -> a
-    422:445: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):938:961 -> a
-    446:459:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:972 -> a
-    460:504: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):970:1014 -> a
-    505:505:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):891:891 -> a
-    506:506:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):899:899 -> a
-    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):159:159 -> b
-    2:25: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):399:422 -> b
-    26:27: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):419:420 -> b
-    28:29: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):455:456 -> b
-    30:30: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):468:468 -> b
-    31:32: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):488:489 -> b
-    33:33:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):562:562 -> b
-    33:33:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):113 -> b
-    34:34:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):116:116 -> b
-    35:35:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571:571 -> b
-    35:35:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> b
-    36:36:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    36:36:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571 -> b
-    36:36:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> b
-    37:81:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):127:171 -> b
-    82:82:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):148:148 -> b
-    83:160:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):141:218 -> b
-    161:161:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):207:207 -> b
-    162:164:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196:198 -> b
-    165:167:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> b
-    168:168:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):178:178 -> b
-    169:169:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571:571 -> b
-    170:170:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    170:170:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571 -> b
-    171:181:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):625:635 -> b
-    182:182:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    182:182:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):635 -> b
-    183:195:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):638:650 -> b
-    196:196:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):687:687 -> b
-    197:197:boolean com.android.tools.r8.shaking.ProguardMemberType.includesMethods():22:22 -> b
-    197:197:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):687 -> b
-    198:199:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):688:689 -> b
-    200:200:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):900:900 -> b
+    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230:245 -> a
+    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):244:244 -> a
+    18:23:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):248:253 -> a
+    24:47:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):260:283 -> a
+    48:56:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):282:290 -> a
+    57:57:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):276:276 -> a
+    58:69:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):310:321 -> a
+    70:101:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):331:362 -> a
+    102:102:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():367:367 -> a
+    103:112:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):384:393 -> a
+    113:114: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):417:418 -> a
+    115:139: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):440:464 -> a
+    140:141: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):476:477 -> a
+    142:150:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):489:497 -> a
+    151:151: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):507:507 -> a
+    152:153: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):509:510 -> a
+    154:155:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):572:573 -> a
+    156:156:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589:589 -> a
+    156:156:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    157:166:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):599:608 -> a
+    157:166:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    157:166:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    167:167:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> a
+    167:167:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):608 -> a
+    167:167:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    167:167:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    168:168:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):611:611 -> a
+    168:168:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    168:168:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    169:169:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):594:594 -> a
+    169:169:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    170:175:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):617:622 -> a
+    170:175:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):585 -> a
+    176:181:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):663:668 -> a
+    182:182:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):667:667 -> a
+    183:183:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):673:673 -> a
+    184:187:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):686:689 -> a
+    184:187:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):674 -> a
+    188:188:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):704:704 -> a
+    189:189:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():18:18 -> a
+    189:189:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):704 -> a
+    190:191:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):705:706 -> a
+    192:196:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):719:723 -> a
+    197:197:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):731:731 -> a
+    198:202:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):739:743 -> a
+    203:209:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):758:764 -> a
+    210:210:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    210:210:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):765 -> a
+    211:213:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):769:771 -> a
+    214:217: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):782:785 -> a
+    218:218:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    218:218: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):785 -> a
+    219:219: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):788:788 -> a
+    220:220:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):794:794 -> a
+    221:221:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    221:221:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):795 -> a
+    222:222:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):797:797 -> a
+    223:242:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):801:820 -> a
+    243:244:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():824:825 -> a
+    243:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
+    245:256:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    257:257:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
+    258:258:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
+    259:284:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
+    285:285:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    285:285:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
+    286:286:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
+    287:302:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    303:323:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):844:864 -> a
+    324:324:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    324:324:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):864 -> a
+    325:334:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):870:879 -> a
+    335:356:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):876:897 -> a
+    357:357:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    357:357:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):897 -> a
+    358:382:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):897:921 -> a
+    383:393:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
+    383:393:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):922 -> a
+    394:424:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):923:953 -> a
+    425:425:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):947:947 -> a
+    426:444:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):944:962 -> a
+    445:459:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:973 -> a
+    460:473:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):971:984 -> a
+    474:518:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):982:1026 -> a
+    519:519:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):897:897 -> a
+    520:520:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):905:905 -> a
+    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):160:160 -> b
+    2:25:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):405:428 -> b
+    26:27: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):425:426 -> b
+    28:29: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):461:462 -> b
+    30:30: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):474:474 -> b
+    31:32: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):494:495 -> b
+    33:33:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):568:568 -> b
+    33:33:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):114 -> b
+    34:34:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):117:117 -> b
+    35:35:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577:577 -> b
+    35:35:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):120 -> b
+    36:36:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    36:36:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577 -> b
+    36:36:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):120 -> b
+    37:81:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):128:172 -> b
+    82:82:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149:149 -> b
+    83:161:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):142:220 -> b
+    162:162:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):209:209 -> b
+    163:165:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> b
+    166:168:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):198:200 -> b
+    169:169:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):179:179 -> b
+    170:170:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577:577 -> b
+    171:171:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    171:171:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577 -> b
+    172:182:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):631:641 -> b
+    183:183:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    183:183:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):641 -> b
+    184:196:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):644:656 -> b
+    197:197:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):693:693 -> b
+    198:198:boolean com.android.tools.r8.shaking.ProguardMemberType.includesMethods():22:22 -> b
+    198:198:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):693 -> b
+    199:200:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):694:695 -> b
+    201:201:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):906:906 -> b
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):562:562 -> c
-    2:2:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):903:903 -> c
+    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):568:568 -> c
+    2:2:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):909:909 -> c
     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):810:810 -> f
-    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):811:811 -> g
+    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
+    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
 com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.t2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
-    1:1:void <clinit>():974:974 -> <clinit>
-    2:2:void <clinit>():963:963 -> <clinit>
-    3:3:void <clinit>():952:952 -> <clinit>
-    4:4:void <clinit>():936:936 -> <clinit>
-    5:5:void <clinit>():138:138 -> <clinit>
+    1:1:void <clinit>():986:986 -> <clinit>
+    2:2:void <clinit>():975:975 -> <clinit>
+    3:3:void <clinit>():964:964 -> <clinit>
+    4:4:void <clinit>():942:942 -> <clinit>
+    5:5:void <clinit>():139:139 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.u2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
@@ -60186,94 +60508,95 @@
     java.util.Set neverClassInline -> b
     java.util.Map dependentNoShrinking -> f
     java.util.Map dependentKeepClassCompatRule -> g
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1395:1395 -> <init>
-    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1411:1418 -> <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,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
+    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.v2$a:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Map dependentKeepClassCompatRule -> r
-    java.util.Set identifierNameStrings -> s
-    java.util.Map mayHaveSideEffects -> n
-    java.util.Set ifRules -> t
-    java.util.Map noSideEffects -> o
-    java.util.Map assumedValues -> p
-    boolean $assertionsDisabled -> u
+    java.util.Map assumedValues -> q
+    java.util.Map dependentNoShrinking -> r
+    java.util.Map dependentKeepClassCompatRule -> s
+    java.util.Set identifierNameStrings -> t
+    java.util.Map mayHaveSideEffects -> o
+    java.util.Set ifRules -> u
+    java.util.Map noSideEffects -> p
+    boolean $assertionsDisabled -> v
     com.android.tools.r8.com.google.common.collect.ImmutableList checkDiscarded -> e
     java.util.Set noOptimization -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> d
     java.util.Map noShrinking -> a
     java.util.Set forceInline -> g
     java.util.Set neverInline -> h
-    java.util.Set keepConstantArguments -> i
-    java.util.Set keepUnusedArguments -> j
+    java.util.Set whyAreYouNotInlining -> i
+    java.util.Set keepConstantArguments -> j
     java.util.Set noObfuscation -> c
     java.util.Set alwaysInline -> f
-    java.util.Set neverClassInline -> k
-    java.util.Set neverMerge -> l
-    java.util.Set neverPropagateValue -> m
-    1:1:void <clinit>():1018:1018 -> <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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1018:1018 -> <init>
-    2:22: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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1062:1082 -> <init>
-    1:1:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1086:1086 -> a
+    java.util.Set keepUnusedArguments -> k
+    java.util.Set neverClassInline -> l
+    java.util.Set neverMerge -> m
+    java.util.Set neverPropagateValue -> n
+    1:1:void <clinit>():1030:1030 -> <clinit>
+    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1030:1030 -> <init>
+    2:23:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1076:1097 -> <init>
+    1:1:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1101:1101 -> a
     2:2:java.util.List com.android.tools.r8.shaking.ProguardConfiguration.getRules():607:607 -> a
-    2:2:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1086 -> a
-    3:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1088:1097 -> a
-    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094:1094 -> a
+    2:2:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1101 -> a
+    3:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1103:1112 -> a
+    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109:1109 -> a
     14:16:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094 -> a
-    17:22:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1114:1119 -> a
-    23:24:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1121:1122 -> a
-    25:25:void addDependentItems(java.util.Map):1128:1128 -> a
-    26:27:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1131:1132 -> a
-    28:28:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1136:1136 -> a
-    29:30:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> a
-    29:30:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
+    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109 -> a
+    17:22:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1129:1134 -> a
+    23:24:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1136:1137 -> a
+    25:25:void addDependentItems(java.util.Map):1143:1143 -> a
+    26:27:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1146:1147 -> a
+    28:28:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1151:1151 -> a
+    29:30:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
+    29:30:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
     31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
     31:31:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():604 -> a
-    31:31:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141 -> a
-    31:31:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    32:32:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141:1141 -> a
-    32:32:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    33:33:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> a
-    33:33:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    34:35:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162:1163 -> a
-    36:37:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> a
-    38:38:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> a
-    39:43:void lambda$forEachDependentNonStaticMember$5(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):1165:1169 -> a
-    44:48:void prune(com.android.tools.r8.graph.DexReference):1193:1197 -> a
-    49:49:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    50:59:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1228:1237 -> a
-    60:68:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1275:1283 -> a
-    69:102:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1290:1323 -> a
+    31:31:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156 -> a
+    31:31:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    32:32:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156:1156 -> a
+    32:32:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    33:33:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
+    33:33:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    34:35:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177:1178 -> a
+    36:37:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
+    38:38:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
+    39:43:void lambda$forEachDependentNonStaticMember$5(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):1180:1184 -> a
+    44:48:void prune(com.android.tools.r8.graph.DexReference):1208:1212 -> a
+    49:49:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    50:59:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1243:1252 -> a
+    60:68:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1290:1298 -> a
+    69:102:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1305:1338 -> a
     103:103:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    103:103:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1327 -> a
-    104:113:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1327:1336 -> a
+    103:103:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1342 -> a
+    104:113:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1342:1351 -> a
     114:114:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    114:114:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1340 -> a
-    115:137:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1340:1362 -> a
-    138:138:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1388:1388 -> a
-    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1122:1122 -> b
-    2:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> b
-    2:3:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
+    114:114:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1355 -> a
+    115:137:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1355:1377 -> a
+    138:138:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1403:1403 -> a
+    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1137:1137 -> b
+    2:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> b
+    2:3:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> b
     4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():604 -> b
-    4:4:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141 -> b
-    4:4:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    5:5:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141:1141 -> b
-    5:5:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    6:6:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> b
-    6:6:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    7:8:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148:1149 -> b
-    9:11:void lambda$forEachDependentStaticMember$4(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):1151:1153 -> b
-    12:12:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1206:1206 -> b
-    13:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1214:1216 -> b
-    16:20:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1215:1219 -> b
-    21:26:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1218:1223 -> b
-    27:27:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1222:1222 -> b
-    28:38:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1245:1255 -> b
-    1:1:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1131:1131 -> c
-    2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1264:1268 -> c
-    7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1308:1308 -> c
-    1:21:java.lang.String toString():1370:1390 -> toString
+    4:4:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156 -> b
+    4:4:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    5:5:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156:1156 -> b
+    5:5:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    6:6:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> b
+    6:6:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    7:8:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163:1164 -> b
+    9:11:void lambda$forEachDependentStaticMember$4(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):1166:1168 -> b
+    12:12:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1221:1221 -> b
+    13:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1229:1231 -> b
+    16:20:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1230:1234 -> b
+    21:26:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1233:1238 -> b
+    27:27:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1237:1237 -> b
+    28:38:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1260:1270 -> b
+    1:1:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1146:1146 -> c
+    2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
+    7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
+    1:21:java.lang.String toString():1385:1405 -> toString
 com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.x2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
@@ -60463,17 +60786,17 @@
     119:119:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):227 -> a
     120:121:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):232:233 -> a
     122:136:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> a
-    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
     138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
     146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
     153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
-    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> a
+    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> a
     176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> a
     177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
     179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
     191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
@@ -60605,14 +60928,14 @@
     3:5:void initializeMergeCandidates(java.lang.Iterable):269:271 -> a
     6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:341 -> a
     24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:349 -> a
-    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
+    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):349 -> a
     28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):355:361 -> a
     35:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:393 -> a
-    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
+    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     59:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):394 -> a
     61:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:400 -> a
-    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):597:597 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):603:603 -> a
     67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
     68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
     69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
@@ -60770,8 +61093,8 @@
     31:32:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1114:1115 -> a
     33:33:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1129:1129 -> a
     34:34:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
-    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
-    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():79 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
+    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
     35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
     36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
     37:40:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1309:1312 -> a
@@ -60827,10 +61150,10 @@
     90:90:boolean merge():955 -> c
     91:94:boolean merge():959:962 -> c
     95:111:boolean merge():961:977 -> c
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
-    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> c
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> c
     112:112:boolean merge():977 -> c
-    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> c
     113:114:boolean merge():977 -> c
     115:115:boolean merge():979:979 -> c
     116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
@@ -60951,11 +61274,11 @@
     1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
 com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Q2:
-    com.android.tools.r8.ir.code.Invoke$Type type -> e
-    boolean isInterface -> f
-    com.android.tools.r8.graph.DexMethod invocationTarget -> d
-    com.android.tools.r8.graph.DexMethod originalMethod -> c
-    com.android.tools.r8.graph.DexMethod method -> b
+    com.android.tools.r8.ir.code.Invoke$Type type -> f
+    com.android.tools.r8.graph.DexMethod invocationTarget -> e
+    boolean isInterface -> g
+    com.android.tools.r8.graph.DexMethod originalMethod -> d
+    com.android.tools.r8.graph.DexMethod method -> c
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1909:1914 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> a
     2:3:void updateMethodSignatures(java.util.function.Function):1929:1930 -> a
@@ -61132,6 +61455,16 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.b3:
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
+    2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
+    java.lang.String typeString() -> u
+    1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.Z2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.a3:
+    1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
+    2:2:void <init>():16:16 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
 com.android.tools.r8.utils.AarArchiveResourceProvider -> com.android.tools.r8.utils.a:
     com.android.tools.r8.origin.Origin origin -> a
     java.nio.file.Path archive -> b
@@ -61190,42 +61523,42 @@
     com.android.tools.r8.utils.AndroidApiLevel K -> m
     com.android.tools.r8.utils.AndroidApiLevel H_MR2 -> s
     com.android.tools.r8.utils.AndroidApiLevel I_MR1 -> q
-    1:30:void <clinit>():12:41 -> <clinit>
-    31:63:void <clinit>():11:43 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):47:48 -> <init>
-    1:1:int getLevel():52:52 -> a
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():60:60 -> b
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):146:146 -> b
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):144:144 -> b
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):142:142 -> b
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):140:140 -> b
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):138:138 -> b
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):136:136 -> b
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):134:134 -> b
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):132:132 -> b
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):130:130 -> b
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):128:128 -> b
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):126:126 -> b
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):124:124 -> b
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):122:122 -> b
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):120:120 -> b
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):118:118 -> b
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):116:116 -> b
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):114:114 -> b
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):112:112 -> b
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):110:110 -> b
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):108:108 -> b
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):106:106 -> b
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):104:104 -> b
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):102:102 -> b
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):100:100 -> b
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):98:98 -> b
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):96:96 -> b
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):94:94 -> b
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):92:92 -> b
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):90:90 -> b
-    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):88:88 -> b
-    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):86:86 -> b
+    1:30:void <clinit>():15:44 -> <clinit>
+    31:63:void <clinit>():14:46 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):50:51 -> <init>
+    1:1:int getLevel():55:55 -> a
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():63:63 -> b
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):155:155 -> b
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):153:153 -> b
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):151:151 -> b
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):149:149 -> b
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):147:147 -> b
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):145:145 -> b
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> b
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> b
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> b
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> b
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> b
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> b
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> b
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> b
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> b
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> b
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> b
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> b
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> b
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> b
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> b
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> b
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> b
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> b
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> b
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> b
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> b
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> b
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> b
+    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
+    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> b
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.h:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.StringResource proguardMapOutputData -> f
@@ -61430,6 +61763,7 @@
 com.android.tools.r8.utils.Box -> com.android.tools.r8.utils.m:
     java.lang.Object value -> a
     1:1:void <init>():11:11 -> <init>
+    2:3:void <init>(java.lang.Object):13:14 -> <init>
     1:1:java.lang.Object get():18:18 -> a
     2:2:void set(java.lang.Object):22:22 -> a
     1:1:boolean isSet():26:26 -> b
@@ -61526,7 +61860,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -61698,39 +62032,49 @@
 com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.E:
     1:14:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):18:31 -> a
     15:25:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):24:34 -> a
-    26:26:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):25:25 -> a
-    27:27:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25:25 -> a
-    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25 -> a
-    33:33:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29:29 -> a
-    34:38:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    34:38:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29 -> a
+    26:26:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):27:27 -> a
+    27:27:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String) -> a
+    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27 -> a
+    33:33:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31:31 -> a
+    34:38:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    34:38:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31 -> a
     39:53:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],com.android.tools.r8.BaseCommand$Builder):33:47 -> a
     54:54:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):48:48 -> a
     55:56:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorServiceForProcessors(int):41:42 -> a
     55:56:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):48 -> a
     57:57:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):49:49 -> a
-    58:68:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):65:75 -> a
-    69:69:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
-    70:72:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    70:72:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    73:73:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
-    74:76:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    74:76:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
-    77:77:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    78:80:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    78:80:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
-    81:81:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    82:88:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):104:110 -> a
-    82:88:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    89:89:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    90:92:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    90:92:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    93:93:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):77:77 -> a
-    94:103:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):87:96 -> a
-    104:105:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):90:91 -> a
-    106:115:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):114:123 -> a
-    116:117:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):117:118 -> a
+    58:75:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:84 -> a
+    76:78:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):78:80 -> a
+    79:79:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    79:79:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    80:85:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    86:87:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    86:87:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    88:90:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:82 -> a
+    91:91:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75:75 -> a
+    92:94:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    92:94:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75 -> a
+    95:95:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
+    96:98:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    96:98:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    99:99:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
+    100:102:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    100:102:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
+    103:103:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    104:110:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):113:119 -> a
+    104:110:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    111:111:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    112:114:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    112:114:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    115:115:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):86:86 -> a
+    116:125:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):96:105 -> a
+    126:127:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):99:100 -> a
+    128:137:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):123:132 -> a
+    138:139:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):126:127 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> c
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> c
@@ -61888,345 +62232,342 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.O:
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> S0
     boolean passthroughDexCode -> i
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
     boolean quiet -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
+    java.lang.String printCfgFile -> A0
     boolean enableRedundantConstNumberOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> t0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> X0
     boolean enableClassInlining -> y
-    java.util.List mainDexKeepRules -> J0
     boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
+    boolean minimalMainDex -> J0
+    boolean configurationDebugging -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean printCfg -> A0
     boolean enableStringSwitchConversion -> Q
     boolean enableUnusedArgumentRemoval -> r
-    boolean enableMinification -> z0
-    java.util.Map warningInvalidDebugInfo -> P0
-    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean printCfg -> z0
+    boolean lookupLibraryBeforeProgram -> v0
     boolean enableClassStaticizer -> z
-    boolean enableNestBasedAccessDesugaring -> r0
+    boolean enableNestReduction -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
-    boolean enableLambdaMerging -> n0
+    boolean enableDesugaring -> n0
+    boolean intermediate -> j0
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> Z0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> T0
     boolean invalidDebugInfoFatal -> c0
     boolean enableValuePropagation -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> s0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> D0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Y0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
-    java.util.Set nullableReceiverInliningFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean minimalMainDex -> K0
+    boolean enableInheritanceClassInDexDistributor -> K0
     int inliningInstructionLimit -> N
-    boolean configurationDebugging -> F0
+    boolean skipIR -> F0
     boolean enableVerticalClassMerging -> p
+    boolean $assertionsDisabled -> c1
+    boolean ignoreMissingClasses -> B0
     boolean enableUninstantiatedTypeOptimization -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean lookupLibraryBeforeProgram -> w0
-    boolean enableNestReduction -> s0
-    java.util.Map warningInvalidParameterAnnotations -> O0
+    boolean enableMainDexListCheck -> w0
+    java.util.List logArgumentsFilter -> l0
+    java.util.Map warningInvalidDebugInfo -> O0
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableDesugaring -> o0
-    boolean intermediate -> k0
+    boolean enableGeneratedExtensionRegistryShrinking -> o0
+    java.util.List methodsFilter -> h0
+    boolean readCompileTimeAnnotations -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
     boolean ignoreMainDexMissingClasses -> d0
     int inliningInstructionAllowance -> O
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> Q0
+    com.android.tools.r8.StringConsumer configurationConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> H0
     java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
-    boolean enableInheritanceClassInDexDistributor -> L0
-    boolean debug -> H0
+    boolean skipReadingDexCode -> P0
     boolean enableDeterminismAnalysis -> C
     int inliningControlFlowResolutionBlocksThreshold -> P
-    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
-    boolean skipIR -> G0
-    boolean $assertionsDisabled -> d1
-    boolean ignoreMissingClasses -> C0
+    boolean debug -> G0
+    boolean forceProguardCompatibility -> C0
     boolean enableRedundantFieldLoadElimination -> U
     boolean enableInlining -> v
-    int minApiLevel -> j0
-    boolean enableMainDexListCheck -> x0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
-    boolean enableGeneratedExtensionRegistryShrinking -> p0
-    java.util.List logArgumentsFilter -> m0
-    java.util.Map missingEnclosingMembers -> N0
+    boolean enableTreeShaking -> x0
+    boolean enableGeneratedMessageLiteShrinking -> p0
+    java.util.Map warningInvalidParameterAnnotations -> N0
     int numberOfThreads -> Y
-    boolean readCompileTimeAnnotations -> l0
-    java.util.Set reportedMissingForDesugaring -> c1
-    java.util.List methodsFilter -> i0
     boolean enableServiceLoaderRewriting -> D
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> R0
     boolean hasMarker -> e0
     boolean verbose -> a0
-    com.android.tools.r8.StringConsumer configurationConsumer -> V0
-    java.lang.String printCfgFile -> B0
     boolean enableEnumValueOptimization -> R
     boolean enableUnusedInterfaceRemoval -> s
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
     boolean useSmaliSyntax -> Z
     java.util.Set extensiveLoggingFilter -> f0
-    boolean skipReadingDexCode -> Q0
+    java.util.List mainDexKeepRules -> I0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
-    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    java.util.function.Consumer syntheticProguardRulesConsumer -> a1
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    boolean enableTreeShaking -> y0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
+    int minApiLevel -> i0
+    boolean enableMinification -> y0
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> V0
     boolean enableDevirtualization -> t
-    boolean enableGeneratedMessageLiteShrinking -> q0
+    boolean processCovariantReturnTypeAnnotations -> u0
+    boolean enableNestBasedAccessDesugaring -> q0
+    java.util.Map missingEnclosingMembers -> M0
+    boolean enableLambdaMerging -> m0
     boolean enableSideEffectAnalysis -> B
-    1:22:void <clinit>():65:86 -> <clinit>
-    23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():64:64 -> <clinit>
-    23:23:void <clinit>():87 -> <clinit>
-    24:24:void <clinit>():87:87 -> <clinit>
-    25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():64:64 -> <clinit>
-    25:25:void <clinit>():87 -> <clinit>
-    1:1:void <init>():111:111 -> <init>
-    2:522:void <init>():105:625 -> <init>
-    523:527:void <init>():112:116 -> <init>
-    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:120 -> <init>
-    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:128 -> <init>
-    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:132 -> <init>
-    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:144 -> <init>
-    1:1:boolean isDesugaredLibraryCompilation():308:308 -> A
-    1:1:boolean isGeneratingClassFiles():329:329 -> B
-    1:1:boolean isGeneratingDexIndexed():321:321 -> C
-    1:1:boolean isGeneratingDex():317 -> C
-    2:2:boolean isGeneratingDexFilePerClassFile():325:325 -> C
-    2:2:boolean isGeneratingDex():317 -> C
-    1:1:boolean hasConsumer():292:292 -> D
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> L0
+    java.util.Set reportedMissingForDesugaring -> b1
+    1:22:void <clinit>():66:87 -> <clinit>
+    23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
+    23:23:void <clinit>():88 -> <clinit>
+    24:24:void <clinit>():88:88 -> <clinit>
+    25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
+    25:25:void <clinit>():88 -> <clinit>
+    1:1:void <init>():112:112 -> <init>
+    2:520:void <init>():106:624 -> <init>
+    521:525:void <init>():113:117 -> <init>
+    526:526:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    527:1045:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1046:1053:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1054:1054:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1055:1573:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1574:1585:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():309:309 -> A
+    1:1:boolean isGeneratingClassFiles():330:330 -> B
+    1:1:boolean isGeneratingDexIndexed():322:322 -> C
+    1:1:boolean isGeneratingDex():318 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():326:326 -> C
+    2:2:boolean isGeneratingDex():318 -> C
+    1:1:boolean hasConsumer():293:293 -> D
     1:1:boolean isInterfaceMethodDesugaringEnabled():1065 -> D
     2:4:boolean isInterfaceMethodDesugaringEnabled():1068:1070 -> D
-    1:1:boolean isMinifying():426:426 -> E
+    1:1:boolean isMinifying():425:425 -> E
     1:1:boolean isProtoShrinkingEnabled():1078:1078 -> F
-    1:1:boolean isShrinking():422:422 -> G
+    1:1:boolean isShrinking():421:421 -> G
     1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> H
-    1:32:boolean printWarnings():800:831 -> I
-    33:72:boolean printWarnings():827:866 -> I
-    1:4:boolean shouldDesugarNests():364:367 -> J
-    5:5:boolean isGeneratingClassFiles():329:329 -> J
+    1:32:boolean printWarnings():799:830 -> I
+    33:72:boolean printWarnings():826:865 -> I
+    1:4:boolean shouldDesugarNests():365:368 -> J
+    5:5:boolean isGeneratingClassFiles():330:330 -> J
     5:5:boolean canUseNestBasedAccess():1048 -> J
-    5:5:boolean shouldDesugarNests():367 -> J
-    1:1:boolean isDesugaredLibraryCompilation():308:308 -> K
-    1:1:boolean shouldKeepStackMapTable():312 -> K
-    2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():98:98 -> K
-    2:2:boolean shouldKeepStackMapTable():313 -> K
-    3:3:boolean shouldKeepStackMapTable():313:313 -> K
-    1:13:void signalFinishedToConsumers():345:357 -> L
-    1:1:boolean assertionsEnabled():620:620 -> M
-    1:9:java.util.Set getExtensiveFieldMinifierLoggingFilter():474:482 -> N
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():487:495 -> O
-    1:9:java.util.Set getExtensiveLoggingFilter():461:469 -> P
-    1:31:java.util.Set getNullableReceiverInliningFilter():499:529 -> Q
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():457:457 -> R
+    5:5:boolean shouldDesugarNests():368 -> J
+    1:1:boolean isDesugaredLibraryCompilation():309:309 -> K
+    1:1:boolean shouldKeepStackMapTable():313 -> K
+    2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
+    2:2:boolean shouldKeepStackMapTable():314 -> K
+    3:3:boolean shouldKeepStackMapTable():314:314 -> K
+    1:13:void signalFinishedToConsumers():346:358 -> L
+    1:1:boolean assertionsEnabled():619:619 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():486:494 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():460:468 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():456:456 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):267:267 -> a
-    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):275:281 -> a
-    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    9:9:boolean isGeneratingClassFiles():329:329 -> a
-    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):282 -> a
-    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283:286 -> a
-    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> a
-    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> a
-    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:745 -> a
-    18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749 -> a
-    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749:749 -> a
-    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750 -> a
-    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750:750 -> a
-    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:745 -> a
-    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:758 -> a
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):268:268 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):276:282 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    9:9:boolean isGeneratingClassFiles():330:330 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):284:287 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> a
+    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):743:744 -> a
+    18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):748 -> a
+    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):748:748 -> a
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749 -> a
+    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749:749 -> a
+    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:744 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):756:757 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760 -> a
-    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760:760 -> a
-    27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
-    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
-    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
-    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766:766 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:758 -> a
-    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):771:774 -> a
-    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):779:783 -> a
-    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:794 -> a
-    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:789 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765:765 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:757 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):770:773 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):778:782 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):787:793 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:788 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:789 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):793:793 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):880:885 -> a
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:788 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):792:792 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):879:884 -> a
     63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1019:1020 -> a
     65:66:boolean canHaveArtInstanceOfVerifierBug():1354:1355 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639:642 -> b
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):638:641 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644:646 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):642:642 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640 -> b
-    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):666:670 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:676 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:645 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641:641 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:669 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):674:675 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678:678 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):782:782 -> b
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:675 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):781:781 -> b
     25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1431:1431 -> b
-    1:1:boolean isGeneratingClassFiles():329:329 -> c
+    1:1:boolean isGeneratingClassFiles():330:330 -> c
     1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445 -> c
     2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445:1445 -> c
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:635 -> c
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> c
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633 -> c
-    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:656 -> c
-    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):657 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> c
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):773:773 -> c
-    1:1:boolean isGeneratingClassFiles():329:329 -> d
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):631:634 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):653:655 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):772:772 -> c
+    1:1:boolean isGeneratingClassFiles():330:330 -> d
     1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101 -> d
     2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101:1101 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):684:686 -> d
-    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):700:734 -> d
-    1:1:boolean isGeneratingClassFiles():329:329 -> e
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):683:685 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):699:733 -> d
+    1:1:boolean isGeneratingClassFiles():330:330 -> e
     1:1:boolean canLeaveStaticInterfaceMethodInvokes():1052 -> e
     2:2:boolean canLeaveStaticInterfaceMethodInvokes():1052:1052 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):693:695 -> e
-    1:1:boolean isGeneratingClassFiles():329:329 -> f
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):692:694 -> e
+    1:1:boolean isGeneratingClassFiles():330:330 -> f
     1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1091 -> f
     2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1091:1091 -> f
-    1:1:boolean isGeneratingClassFiles():329:329 -> g
+    1:1:boolean isGeneratingClassFiles():330:330 -> g
     1:1:boolean canUseConstantMethodHandle():1032 -> g
     2:2:boolean canUseConstantMethodHandle():1032:1032 -> g
-    1:1:boolean isGeneratingClassFiles():329:329 -> h
+    1:1:boolean isGeneratingClassFiles():330:330 -> h
     1:1:boolean canUseConstantMethodType():1036 -> h
     2:2:boolean canUseConstantMethodType():1036:1036 -> h
-    1:1:boolean isGeneratingClassFiles():329:329 -> i
+    1:1:boolean isGeneratingClassFiles():330:330 -> i
     1:1:boolean canUseDefaultAndStaticInterfaceMethods():1044 -> i
     2:2:boolean canUseDefaultAndStaticInterfaceMethods():1044:1044 -> i
     1:2:boolean canUseFilledNewArrayOfObjects():1113:1114 -> j
-    1:1:boolean isGeneratingClassFiles():329:329 -> k
+    1:1:boolean isGeneratingClassFiles():330:330 -> k
     1:1:boolean canUseInvokeCustom():1040 -> k
     2:2:boolean canUseInvokeCustom():1040:1040 -> k
-    1:1:boolean isGeneratingClassFiles():329:329 -> l
+    1:1:boolean isGeneratingClassFiles():330:330 -> l
     1:1:boolean canUseInvokePolymorphic():1028 -> l
     2:2:boolean canUseInvokePolymorphic():1028:1028 -> l
-    1:1:boolean isGeneratingClassFiles():329:329 -> m
+    1:1:boolean isGeneratingClassFiles():330:330 -> m
     1:1:boolean canUseInvokePolymorphicOnVarHandle():1024 -> m
     2:2:boolean canUseInvokePolymorphicOnVarHandle():1024:1024 -> m
     1:2:boolean canUseMultidex():1082:1083 -> n
-    1:1:boolean isGeneratingClassFiles():329:329 -> o
+    1:1:boolean isGeneratingClassFiles():330:330 -> o
     1:1:boolean canUseNotInstruction():1149 -> o
     2:2:boolean canUseNotInstruction():1149:1149 -> o
-    1:1:boolean isGeneratingClassFiles():329:329 -> p
+    1:1:boolean isGeneratingClassFiles():330:330 -> p
     1:1:boolean canUsePrivateInterfaceMethods():1060 -> p
     2:2:boolean canUsePrivateInterfaceMethods():1060:1060 -> p
     1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1122:1123 -> q
-    1:1:boolean isGeneratingClassFiles():329:329 -> r
+    1:1:boolean isGeneratingClassFiles():330:330 -> r
     1:1:boolean canUseSuppressedExceptions():1087 -> r
     2:2:boolean canUseSuppressedExceptions():1087:1087 -> r
-    1:1:boolean isGeneratingClassFiles():329:329 -> s
+    1:1:boolean isGeneratingClassFiles():330:330 -> s
     1:1:boolean canUseTwrCloseResourceMethod():1056 -> s
     2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> s
-    1:4:void disableAllOptimizations():148:151 -> t
-    1:17:void disableGlobalOptimizations():155:171 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> v
-    2:2:boolean hasConsumer():292:292 -> v
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296 -> v
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> v
-    4:4:boolean isGeneratingDexIndexed():321:321 -> v
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> v
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298:298 -> v
-    6:6:boolean isGeneratingDexFilePerClassFile():325:325 -> v
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300:300 -> v
-    8:8:boolean isGeneratingClassFiles():329:329 -> v
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301 -> v
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:304 -> v
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():98:98 -> w
-    1:1:boolean hasMethodsFilter():875:875 -> x
-    1:1:boolean hasProguardConfiguration():94:94 -> y
-    1:1:boolean hasUsageInformationConsumer():582:582 -> z
+    1:4:void disableAllOptimizations():149:152 -> t
+    1:17:void disableGlobalOptimizations():156:172 -> u
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> v
+    2:2:boolean hasConsumer():293:293 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> v
+    4:4:boolean isGeneratingDexIndexed():322:322 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():326:326 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    8:8:boolean isGeneratingClassFiles():330:330 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:305 -> v
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
+    1:1:boolean hasMethodsFilter():874:874 -> x
+    1:1:boolean hasProguardConfiguration():95:95 -> y
+    1:1:boolean hasUsageInformationConsumer():581:581 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing ENABLE -> c
-    1:5:void <clinit>():78:82 -> <clinit>
-    1:1:void <init>(java.lang.String,int):76:76 -> <init>
+    1:5:void <clinit>():79:83 -> <clinit>
+    1:1:void <init>(java.lang.String,int):77:77 -> <init>
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.P:
     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):539:542 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():72:73 -> <clinit>
-    1:1:void <init>(java.lang.String,int):71:71 -> <init>
+    1:2:void <clinit>():73:74 -> <clinit>
+    1:1:void <init>(java.lang.String,int):72:72 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.O$c:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():907:915 -> <init>
+    1:9:void <init>():906:914 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():900:904 -> <clinit>
-    6:6:void <clinit>():898:898 -> <clinit>
-    1:1:void <init>(java.lang.String,int):898:898 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():898:898 -> a
+    1:5:void <clinit>():899:903 -> <clinit>
+    6:6:void <clinit>():897:897 -> <clinit>
+    1:1:void <init>(java.lang.String,int):897:897 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():897:897 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> H
     boolean enableDeadSwitchCaseElimination -> i
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -62234,17 +62575,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean allowOutlinerInterfaceArrayArguments -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean measureProguardIfRuleEvaluations -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean verifyKeptGraphInfo -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> F
     boolean forceJumboStringProcessing -> p
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -62252,12 +62592,14 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
-    boolean enableForceNestBasedAccessDesugaringForTest -> B
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
-    boolean readInputStackMaps -> D
-    1:84:void <init>():918:1001 -> <init>
+    java.io.PrintStream whyAreYouNotInliningConsumer -> B
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():917:1001 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
     1:3:void <init>():987:989 -> <init>
@@ -62270,7 +62612,7 @@
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):551:553 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -62365,7 +62707,7 @@
     290:294:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):314:318 -> a
     295:295:void sortMethods(java.util.List):327:327 -> a
     296:297:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1075 -> a
+    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1097:1097 -> a
     298:298:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
     299:299:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
     300:304:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:360 -> a
@@ -62601,7 +62943,7 @@
     18:22:boolean assumeClassesAreEqual(com.android.tools.r8.graph.DexProgramClass):84:88 -> a
     18:22:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):73 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):76:76 -> a
-    24:24:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    24:24:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     24:24:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):78 -> a
     25:25:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):78:78 -> a
     26:26:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a

compatproguard-master.jar

diff --git a/compatproguard-master.jar b/compatproguard-master.jar
index ee1ce5a..8e1cbe4 100644
--- a/compatproguard-master.jar
+++ b/compatproguard-master.jar
Binary files differ

compatproguard-master.jar.map

diff --git a/compatproguard-master.jar.map b/compatproguard-master.jar.map
index d7df262..fcfe2e2 100644
--- a/compatproguard-master.jar.map
+++ b/compatproguard-master.jar.map
@@ -1,17 +1,17 @@
 # compiler: R8
-# compiler_version: 1.7.6-dev
+# compiler_version: 1.7.7-dev
 # compiler_hash: engineering
-# pg_map_id: cf242b0
+# pg_map_id: a0a1cbb
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:15 -> <init>
     1:1:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:21 -> a
-    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     2:2:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
     3:7:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24:28 -> a
-    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     8:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
 com.android.tools.r8.ArchiveClassFileProvider -> com.android.tools.r8.ArchiveClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
@@ -226,7 +226,7 @@
     1:1:boolean isMinApiLevelSet():390:390 -> getMinApiLevel
     1:1:int getMinApiLevel():386 -> getMinApiLevel
     2:2:int getMinApiLevel():386:386 -> getMinApiLevel
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> getMinApiLevel
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> getMinApiLevel
     3:3:int getMinApiLevel():386 -> getMinApiLevel
     4:4:int getMinApiLevel():386:386 -> getMinApiLevel
     1:1:com.android.tools.r8.CompilationMode getMode():190:190 -> getMode
@@ -344,7 +344,7 @@
     1:1:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> a
     1:1:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):136 -> a
     2:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):137:137 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    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 runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):137 -> a
     4:6:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):82:84 -> a
     7:18:void run(java.lang.String[]):107:118 -> a
@@ -352,7 +352,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):356:356 -> 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):363:363 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +361,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):352:352 -> d
+    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -378,10 +378,10 @@
     3:3:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> run
     3:3:void run(com.android.tools.r8.D8Command):77 -> run
     4:4:void run(com.android.tools.r8.D8Command):79:79 -> run
-    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
+    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     5:5:void run(com.android.tools.r8.D8Command):78 -> run
     6:9:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):97:100 -> run
-    10:10:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
+    10:10:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     10:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):99 -> run
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> s
@@ -440,7 +440,7 @@
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:82:void <clinit>():26:107 -> <clinit>
-    83:83:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> <clinit>
+    83:83:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> <clinit>
     83:83:void <clinit>():121 -> <clinit>
     84:84:void <clinit>():121:121 -> <clinit>
     85:85:void <clinit>():110:110 -> <clinit>
@@ -555,7 +555,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(java.util.Map):32:33 -> <init>
     1:2:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):62:63 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    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):63 -> a
     4:4:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):65:65 -> a
     5:15:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):74:84 -> a
@@ -715,13 +715,13 @@
     2:3:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):127:128 -> a
     4:4:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> a
     4:4:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     5:5:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> a
     5:5:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
     6:6:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130:130 -> a
     7:7:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> a
     7:7:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
-    8:8:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    8:8:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     8:8:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> a
     8:8:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):130 -> a
     9:19:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):131:141 -> a
@@ -862,7 +862,7 @@
     2:2:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):124 -> run
     3:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):126:128 -> run
     6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):147:151 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> run
     11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):150 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):159:159 -> run
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
@@ -920,23 +920,24 @@
 com.android.tools.r8.GeneratedOutlineSupport -> com.android.tools.r8.k:
     long outline0(long,long,long) -> a
     com.android.tools.r8.errors.Unreachable outline1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.StringDiagnostic) -> a
-    java.lang.StringBuilder outline10(java.lang.String) -> a
-    java.lang.StringBuilder outline11(java.lang.String,int,java.lang.String) -> a
+    java.lang.StringBuilder outline10(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.StringBuilder outline11(java.lang.String) -> a
+    java.lang.StringBuilder outline12(java.lang.String,int,java.lang.String) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
-    java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
-    java.lang.String outline4(java.lang.String,int) -> a
-    java.lang.String outline6(java.lang.String,java.lang.String) -> a
-    java.lang.String outline7(java.lang.StringBuilder,int,java.lang.String) -> a
-    java.lang.String outline8(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
-    java.lang.String outline5(java.lang.String,int,java.lang.String) -> b
-    java.lang.StringBuilder outline9(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
+    java.lang.String outline5(java.lang.String,int) -> a
+    java.lang.String outline7(java.lang.String,java.lang.String) -> a
+    java.lang.String outline8(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.String outline4(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    java.lang.String outline6(java.lang.String,int,java.lang.String) -> b
 com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.l:
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87:87 -> a
-    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87 -> a
     3:10:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:100 -> a
     11:11:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:106 -> a
@@ -946,12 +947,12 @@
     12:12:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     13:27:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:123 -> a
     13:27:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):347:347 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):354:354 -> a
     28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
     28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
     29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
     42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -993,33 +994,33 @@
     3:3:void <init>():158:158 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):162:162 -> <init>
     5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):154:155 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):189:189 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):195:195 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():227:231 -> c
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):194:194 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):182:182 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):188:188 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():220:224 -> c
     1:5:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():232 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():225 -> c
     6:6:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    7:63:com.android.tools.r8.L8Command makeCommand():232:288 -> c
+    7:63:com.android.tools.r8.L8Command makeCommand():225:281 -> c
     7:63:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    64:64:com.android.tools.r8.L8Command makeCommand():228:228 -> c
+    64:64:com.android.tools.r8.L8Command makeCommand():221:221 -> c
     64:64:com.android.tools.r8.BaseCommand makeCommand():151 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():207:222 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> f
-    1:2:boolean isShrinking():167:168 -> isShrinking
+    1:16:void validate():200:215 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> f
+    1:1:boolean isShrinking():167:167 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
     1:1:void <init>():79:79 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):83:87 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):85:91 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():294:296 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:304 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):303:303 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:302 -> accept
-    1:1:java.util.Collection getProgramResources():309:309 -> getProgramResources
+    1:3:void <init>():287:289 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:297 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):296:296 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:295 -> accept
+    1:1:java.util.Collection getProgramResources():302:302 -> getProgramResources
 com.android.tools.r8.OptionalBool -> com.android.tools.r8.p:
     com.android.tools.r8.OptionalBool TRUE -> a
     com.android.tools.r8.OptionalBool FALSE -> b
@@ -1093,14 +1094,14 @@
     1:1:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> a
     1:1:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):225 -> a
     2:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226:226 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> a
+    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> a
     4:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):179:179 -> a
     5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
     17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):150:150 -> a
@@ -1135,60 +1136,60 @@
     512:512:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):645:645 -> a
     513:529:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):642:658 -> a
     530:585:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):657:712 -> a
-    586:676:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:801 -> a
-    677:702:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:775 -> a
-    703:721:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):771:789 -> a
-    722:739:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):784:801 -> a
-    740:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
-    741:741:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
-    742:1168:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:801 -> a
-    1169:1170:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
-    1171:1171:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
-    1172:1176:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
-    1177:1179:void lambda$run$4(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):586:588 -> a
-    1180:1180:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
-    1181:1181:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
-    1182:1182:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
-    1183:1183:void lambda$run$9(java.lang.String):744:744 -> a
-    1184:1184:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
-    1185:1185:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
-    1186:1188: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):818:820 -> a
-    1189:1211: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):819:841 -> a
-    1212:1223: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):839:850 -> a
-    1224:1228: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):849:853 -> a
-    1229:1234: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:856 -> a
-    1235:1235:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1235:1235: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):856 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1236:1236:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1236: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):856 -> a
-    1237:1237: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):856:856 -> a
-    1238:1241:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):860:863 -> a
-    1242:1242:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):882:882 -> a
-    1243:1243:void lambda$main$13(java.lang.String[]):898:898 -> a
+    586:680:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:805 -> a
+    681:710:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:779 -> a
+    711:729:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):775:793 -> a
+    730:747:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):788:805 -> a
+    748:748:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
+    749:749:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
+    750:1180:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:805 -> a
+    1181:1182:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
+    1183:1183:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
+    1184:1188:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
+    1189:1191:void lambda$run$4(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):586:588 -> a
+    1192:1192:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
+    1193:1193:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
+    1194:1194:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
+    1195:1195:void lambda$run$9(java.lang.String):744:744 -> a
+    1196:1196:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
+    1197:1197:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
+    1198:1200: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):822:824 -> a
+    1201:1223: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):823:845 -> a
+    1224:1235:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):843:854 -> a
+    1236: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):853:857 -> a
+    1241:1246: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):855:860 -> a
+    1247:1247:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1247:1247: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):860 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1248: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):860 -> a
+    1249:1249: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):860:860 -> a
+    1250:1253:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):864:867 -> a
+    1254:1254:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):886:886 -> a
+    1255:1255:void lambda$main$13(java.lang.String[]):902:902 -> 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):230:232 -> b
-    4:5:void run(java.lang.String[]):868:869 -> b
+    4:5:void run(java.lang.String[]):872:873 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):870 -> b
-    7:7:void run(java.lang.String[]):871:871 -> b
+    6:6:void run(java.lang.String[]):874 -> b
+    7:7:void run(java.lang.String[]):875:875 -> 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[]):870 -> b
-    9:13:void run(java.lang.String[]):874:878 -> b
+    8:8:void run(java.lang.String[]):874 -> b
+    9:13:void run(java.lang.String[]):878:882 -> b
     14:14:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> b
-    14:14:void run(java.lang.String[]):879 -> b
-    15:15:void run(java.lang.String[]):881:881 -> b
-    16:16:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> b
-    16:16:void run(java.lang.String[]):881 -> b
-    17:17:void run(java.lang.String[]):884:884 -> b
+    14:14:void run(java.lang.String[]):883 -> b
+    15:15:void run(java.lang.String[]):885:885 -> b
+    16:16:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> b
+    16:16:void run(java.lang.String[]):885 -> b
+    17:17:void run(java.lang.String[]):888:888 -> b
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):239:239 -> c
-    1:5:void main(java.lang.String[]):894:898 -> main
+    1:5:void main(java.lang.String[]):898:902 -> main
     1:3:void run(com.android.tools.r8.R8Command):158:160 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):174:177 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> 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):176 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.util.List mainDexKeepRules -> o
@@ -1224,7 +1225,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():825:835 -> c
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():832:842 -> c
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():839:856 -> c
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():857 -> c
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():858:872 -> c
     1:1:boolean getEnableMinification():764:764 -> getEnableMinification
@@ -1338,7 +1339,7 @@
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:31:void <clinit>():18:48 -> <clinit>
-    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> <clinit>
+    32:32:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> <clinit>
     32:32:void <clinit>():64 -> <clinit>
     33:33:void <clinit>():64:64 -> <clinit>
     34:34:void <clinit>():51:51 -> <clinit>
@@ -1688,14 +1689,14 @@
     211:212:void print(com.android.tools.r8.cf.code.CfFieldInstruction):452:453 -> a
     213:217:void appendDescriptor(com.android.tools.r8.graph.DexType):689:693 -> a
     213:217:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    218:218:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     218:218:void appendDescriptor(com.android.tools.r8.graph.DexType):693 -> a
     218:218:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
     219:219:void appendDescriptor(com.android.tools.r8.graph.DexType):693:693 -> a
     219:219:void print(com.android.tools.r8.cf.code.CfFieldInstruction):453 -> a
     220:222:void print(com.android.tools.r8.cf.code.CfNew):457:459 -> a
     223:224:void print(com.android.tools.r8.cf.code.CfNewArray):463:464 -> a
-    225:225:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    225:225:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     225:225:void print(com.android.tools.r8.cf.code.CfNewArray):464 -> a
     226:230:void print(com.android.tools.r8.cf.code.CfNewArray):464:468 -> a
     231:231:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -1970,16 +1971,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):115:115 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:123 -> <init>
     1:8:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:134 -> a
-    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> a
     9:9:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):136 -> a
     10:12:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):137:139 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():197:197 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():200:200 -> a
     13:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():201:201 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():204:204 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():205:205 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():208:208 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
-    16:16:boolean com.android.tools.r8.graph.DexType.isIntType():209:209 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isIntType():212:212 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143 -> a
     17:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
     23:26:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):148:151 -> a
@@ -2006,13 +2007,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2032,7 +2033,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():56 -> toString
 com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.x.i:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
@@ -2375,7 +2376,7 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():116:116 -> g
     1:1:java.lang.String toString():90:90 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():90 -> toString
 com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.x.m.s:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
@@ -8472,7 +8473,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.z.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -12819,24 +12821,24 @@
     70:74:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):139:143 -> a
     75:76:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):164:165 -> a
     75:76:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    77:77:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():60:60 -> a
+    77:77:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getDefault():63:63 -> a
     77:77:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):165 -> a
     77:77:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
     78:78:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):165:165 -> a
     78:78:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    79:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):68:78 -> a
+    79:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):77:87 -> a
     79:89:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     79:89:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):76:76 -> a
+    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
     90:90:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     90:90:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    91:91:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):74:74 -> a
+    91:91:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
     91:91:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     91:91:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    92:92:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):72:72 -> a
+    92:92:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
     92:92:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     92:92:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    93:93:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):70:70 -> a
+    93:93:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:79 -> a
     93:93:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     93:93:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
     94:97:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167:170 -> a
@@ -12873,7 +12875,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12941,10 +12943,10 @@
     157:165:void write(java.util.concurrent.ExecutorService):358:366 -> a
     166:166:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):294:294 -> a
     167:171:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):305:309 -> a
-    172:172:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> a
+    172:172:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> a
     172:172:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):309 -> a
     173:180:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):312:319 -> a
-    181:181:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():333:333 -> a
+    181:181:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():334:334 -> a
     181:181:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):319 -> a
     182:185:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:326 -> a
     186:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):325:325 -> a
@@ -13014,10 +13016,10 @@
     481:481:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638:638 -> a
     482:487:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):634:639 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189:189 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():325:325 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():326:326 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:201 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
@@ -13089,7 +13091,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13429,7 +13431,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -14210,7 +14212,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -15183,7 +15185,7 @@
     4:4:void commitTransaction():230:230 -> a
     4:4:void injectString(com.android.tools.r8.graph.DexString):147 -> a
     5:5:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
-    6:6:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    6:6:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     6:6:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):156 -> a
     7:7:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):156:156 -> a
     8:8:void lambda$computeOriginalNameMapping$0(java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):155:155 -> a
@@ -15324,7 +15326,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> call
     8:8:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):899 -> call
     8:8:java.util.Map call():913 -> call
-    9:9:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> call
+    9:9:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> call
     9:9:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> call
     9:9:java.lang.String getOriginalName(com.android.tools.r8.graph.DexProgramClass):899 -> call
     9:9:java.util.Map call():913 -> call
@@ -15350,7 +15352,7 @@
     146:146:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209:209 -> call
     146:146:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1016 -> call
     146:146:java.util.Map call():993 -> call
-    147:147:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> call
+    147:147:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> call
     147:147:java.lang.String com.android.tools.r8.graph.DexProgramClass.toString():209 -> call
     147:147:void addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1016 -> call
     147:147:java.util.Map call():993 -> call
@@ -15771,13 +15773,13 @@
     2:13:void <init>(java.util.List,com.android.tools.r8.utils.Reporter):31:42 -> <init>
     14:19:void <init>(java.util.List,com.android.tools.r8.utils.Reporter):41:46 -> <init>
     1:4:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):54:57 -> a
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     5:5:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):58 -> a
     6:9:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):58:61 -> a
     10:10:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):61:61 -> a
     11:26:java.util.Collection getDataResourceProvidersAndConsumers():87:102 -> a
     27:27:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
-    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     28:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):112 -> a
     29:29:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
     29:29:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):112 -> a
@@ -15785,7 +15787,7 @@
     31:31:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116:116 -> a
     32:37:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):120:125 -> a
     32:37:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
-    38:38:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    38:38:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     38:38:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126 -> a
     38:38:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     39:39:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -15793,7 +15795,7 @@
     39:39:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     40:40:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:125 -> a
     40:40:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
-    41:41:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    41:41:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     42:42:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
@@ -15919,7 +15921,7 @@
     77:77:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
     77:77:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612 -> a
     78:78:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):640:640 -> a
-    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     79:79:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96 -> a
     80:80:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():70:71 -> b
@@ -15982,92 +15984,97 @@
     1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):654:661 -> a
     9:12:com.android.tools.r8.graph.ResolutionResult build():666:669 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.C.f:
+    boolean $assertionsDisabled -> m
     java.util.Set missingClasses -> g
-    boolean $assertionsDisabled -> l
     java.util.Map supertypesForSynthesizedClasses -> i
     java.util.Map typeInfo -> j
-    java.util.Set NO_DIRECT_SUBTYPE -> k
+    java.util.Map mayHaveFinalizeMethodDirectlyOrIndirectlyCache -> k
+    java.util.Set NO_DIRECT_SUBTYPE -> l
     java.util.Map subtypeMap -> h
     1:8:void <clinit>():27:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):127:127 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexApplication):114:130 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):134:134 -> <init>
-    20:44:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):114:138 -> <init>
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):143:164 -> a
-    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):213:236 -> a
-    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):242:250 -> a
-    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):255:289 -> a
-    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250 -> a
-    91:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):319:324 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> a
+    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    91:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:330 -> a
     97:97:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> a
-    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:331 -> a
     99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> a
-    100:100:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> a
+    100:100:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:331 -> a
     101:120:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):203:222 -> a
-    101:120:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):327 -> a
-    121:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):349:355 -> a
+    101:120:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):333 -> a
+    121:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> a
     128:128:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    128:128:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355 -> a
-    129:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> a
-    136:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):383:393 -> a
-    147:147:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> a
-    147:147:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393 -> a
-    148:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):404:413 -> a
+    128:128:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361 -> a
+    129:135:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361:367 -> a
+    136:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):389:399 -> a
+    147:147:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    147:147:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):399 -> a
+    148:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):410:419 -> a
     158:158:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    158:158:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):413 -> a
-    159:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):414:417 -> a
-    163:163:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):386:386 -> a
-    164:167:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):424:427 -> a
-    168:170:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):432:434 -> a
-    171:186:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):496:511 -> a
-    187:196:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):532:541 -> a
-    197:209:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):617:629 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):199:202 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):655:703 -> b
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):709:709 -> c
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):556:564 -> d
-    10:12:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:647 -> d
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479:482 -> e
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> e
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):483 -> e
-    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):580:584 -> e
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):450:450 -> f
-    2:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):468:471 -> f
-    6:8:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> f
-    6:8:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):472 -> f
-    1:10:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:524 -> g
-    11:14:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):634:637 -> g
-    15:15:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    15:15:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
-    16:16:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    16:16:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637 -> g
-    17:17:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637:637 -> g
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):331:331 -> h
-    2:2:boolean hasSubtyping():439:439 -> h
-    3:3:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):509:509 -> h
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):463:463 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):602:613 -> j
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):612:612 -> j
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):458:458 -> k
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):588:588 -> l
+    158:158:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419 -> a
+    159:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):420:423 -> a
+    163:163:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):392:392 -> a
+    164:167:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):430:433 -> a
+    168:170:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):438:440 -> a
+    171:186:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):502:517 -> a
+    187:196:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):538:547 -> a
+    197:209:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):623:635 -> a
+    210:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):724:744 -> a
+    231:231:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):456:456 -> a
+    231:231:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):749 -> a
+    232:238:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):749:755 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):661:709 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):715:715 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):485:488 -> d
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):489 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):562:570 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):474:477 -> e
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):478 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):586:590 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):456:456 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):521:530 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:515 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):640:643 -> g
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643:643 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):337:337 -> h
+    2:2:boolean hasSubtyping():445:445 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):469:469 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):608:619 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):618:618 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):464:464 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594:594 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):589 -> l
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():445:445 -> m
-    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):597:597 -> m
-    1:2:java.util.Set getMissingClasses():185:186 -> n
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):454:454 -> n
-    4:4:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> n
-    4:4:boolean isUnknown(com.android.tools.r8.graph.DexType):454 -> n
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595 -> l
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():451:451 -> m
+    2:2:boolean isSerializable(com.android.tools.r8.graph.DexType):603:603 -> m
+    1:2:java.util.Set getMissingClasses():191:192 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):460:460 -> n
+    4:4:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    4:4:boolean isUnknown(com.android.tools.r8.graph.DexType):460 -> n
     1:1:java.util.Set access$000():27:27 -> o
-    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):190:193 -> o
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):208:208 -> p
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):559:559 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):562:562 -> r
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):582:582 -> s
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):199:199 -> t
+    2:2:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):719:719 -> o
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
+    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):565:565 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):568:568 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):588:588 -> t
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
@@ -16075,16 +16082,17 @@
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
     1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):49:49 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):39:50 -> <init>
-    1:11:void setLevel(int):65:75 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):80:83 -> a
-    16:18:boolean isInterface():95:97 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):107:109 -> a
-    1:1:void tagAsInteface():91:91 -> b
-    1:1:void tagAsSubtypeRoot():87:87 -> c
-    1:2:void ensureDirectSubTypeSet():59:60 -> d
-    1:1:java.lang.String toString():55:55 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.C.i:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -16131,7 +16139,7 @@
     38:47:boolean lambda$readServiceImplementationsForService$2(com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):193:202 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):209:210 -> b
     1:6:void visit(com.android.tools.r8.DataEntryResource):157:162 -> visit
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16159,7 +16167,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):70:70 -> <init>
     2:42:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48:88 -> <init>
     1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93:93 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):61 -> a
     2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93 -> a
     3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):62:62 -> a
@@ -16269,20 +16277,22 @@
     3:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:58 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
 com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.C.o:
+    boolean $assertionsDisabled -> b
     int hash -> a
+    1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>():9:13 -> <init>
     boolean computeEquals(java.lang.Object) -> b
-    1:1:boolean equals(java.lang.Object):40:40 -> equals
+    1:1:boolean equals(java.lang.Object):42:42 -> equals
     int computeHashCode() -> h
-    1:7:int hashCode():21:27 -> hashCode
+    1:10:int hashCode():21:30 -> hashCode
 com.android.tools.r8.graph.CfCode -> com.android.tools.r8.C.q:
-    java.util.List tryCatchRanges -> f
-    java.util.List instructions -> e
-    com.android.tools.r8.graph.DexType originalHolder -> b
-    int maxLocals -> d
-    boolean $assertionsDisabled -> h
-    java.util.List localVariables -> g
-    int maxStack -> c
+    boolean $assertionsDisabled -> i
+    java.util.List instructions -> f
+    com.android.tools.r8.graph.DexType originalHolder -> c
+    int maxStack -> d
+    java.util.List localVariables -> h
+    int maxLocals -> e
+    java.util.List tryCatchRanges -> g
     1:1:void <clinit>():39:39 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):105:111 -> <init>
     1:1:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):196:196 -> a
@@ -16501,6 +16511,7 @@
     boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
     boolean registerNewInstance(com.android.tools.r8.graph.DexType) -> c
+    boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> c
     boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
@@ -16569,7 +16580,7 @@
     150:150:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> a
     150:150:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):376 -> a
     151:151:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):376:376 -> a
-    152:152:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    152:152:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     152:152:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378 -> a
     153:154:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378:379 -> a
     155:161:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):385:391 -> a
@@ -16640,11 +16651,11 @@
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
 com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.F:
-    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> e
-    boolean $assertionsDisabled -> f
-    com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> d
-    int sorted -> c
-    com.android.tools.r8.graph.DexAnnotation[] annotations -> b
+    boolean $assertionsDisabled -> g
+    int sorted -> d
+    com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> e
+    com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> f
+    com.android.tools.r8.graph.DexAnnotation[] annotations -> c
     1:6:void <clinit>():16:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):27:27 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
@@ -16652,7 +16663,7 @@
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:72 -> a
     5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
-    6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
     7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
     9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
@@ -16736,14 +16747,14 @@
     1:1:java.util.List getClasses():88:88 -> a
     1:3:boolean reorderClasses():80:82 -> b
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.J:
-    com.android.tools.r8.graph.DexString methodName -> d
-    int instructionOffset -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.graph.DexProto methodProto -> e
-    com.android.tools.r8.graph.DexEncodedArray encodedArray -> h
-    com.android.tools.r8.graph.DexMethod method -> i
-    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> f
-    java.util.List bootstrapArgs -> g
+    com.android.tools.r8.graph.DexString methodName -> e
+    com.android.tools.r8.graph.DexMethod method -> j
+    int instructionOffset -> k
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.graph.DexProto methodProto -> f
+    com.android.tools.r8.graph.DexEncodedArray encodedArray -> i
+    java.util.List bootstrapArgs -> h
+    com.android.tools.r8.graph.DexMethodHandle bootstrapMethod -> g
     1:1:void <clinit>():24:24 -> <clinit>
     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>
@@ -16904,9 +16915,9 @@
     67:68:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):580:581 -> a
     69:71:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):683:685 -> a
     72:78:boolean isResolvable(com.android.tools.r8.graph.AppView):709:715 -> a
-    79:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270:271 -> a
+    79:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276:277 -> a
     79:80:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
-    81:81:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270:270 -> a
+    81:81:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276:276 -> a
     81:81:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
     82:85:boolean isResolvable(com.android.tools.r8.graph.AppView):722:725 -> a
     86:93:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):742:749 -> a
@@ -17002,19 +17013,19 @@
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):70:70 -> b
     1:1:java.lang.String toString():64:64 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():64 -> toString
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.S:
-    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.code.Instruction[] instructions -> g
-    com.android.tools.r8.graph.DexString highestSortingString -> h
-    int outgoingRegisterSize -> d
-    int registerSize -> b
-    int incomingRegisterSize -> c
-    com.android.tools.r8.graph.DexCode$TryHandler[] handlers -> f
-    com.android.tools.r8.graph.DexCode$Try[] tries -> e
-    com.android.tools.r8.graph.DexDebugInfo debugInfo -> i
+    com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.code.Instruction[] instructions -> h
+    com.android.tools.r8.graph.DexString highestSortingString -> i
+    int incomingRegisterSize -> d
+    com.android.tools.r8.graph.DexCode$TryHandler[] handlers -> g
+    int outgoingRegisterSize -> e
+    com.android.tools.r8.graph.DexDebugInfo debugInfo -> j
+    int registerSize -> c
+    com.android.tools.r8.graph.DexCode$Try[] tries -> f
     1:1:void <clinit>():33:33 -> <clinit>
     1:9:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):56:64 -> <init>
     1:3:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):104:106 -> a
@@ -17367,10 +17378,10 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
 com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.C.k0:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexDebugEvent[] events -> d
-    int startLine -> b
-    com.android.tools.r8.graph.DexString[] parameters -> c
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexDebugEvent[] events -> e
+    int startLine -> c
+    com.android.tools.r8.graph.DexString[] parameters -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):17:24 -> <init>
     1:5:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):28:32 -> a
@@ -17540,449 +17551,450 @@
     com.android.tools.r8.OptionalBool isLibraryMethodOverride -> k
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> n
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:46:void <clinit>():79:124 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):200:200 -> <init>
-    2:75: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):134:207 -> <init>
-    76:77: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):217:218 -> <init>
-    1:1:java.util.Map getParameterInfo():471:471 -> A
-    1:2:boolean hasAnnotation():1060:1061 -> B
-    1:2:boolean hasClassFileVersion():532:533 -> C
-    1:1:boolean hasCode():512:512 -> D
-    1:1:boolean hasParameterInfo():467:467 -> E
-    1:1:boolean isAbstract():247:247 -> F
+    1:46:void <clinit>():80:125 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):201:201 -> <init>
+    2:75: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):135:208 -> <init>
+    76:77: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):218:219 -> <init>
+    1:1:java.util.Map getParameterInfo():509:509 -> A
+    1:2:boolean hasAnnotation():1082:1083 -> B
+    1:2:boolean hasClassFileVersion():570:571 -> C
+    1:1:boolean hasCode():550:550 -> D
+    1:1:boolean hasParameterInfo():505:505 -> E
+    1:1:boolean isAbstract():248:248 -> F
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> F
-    2:2:boolean isAbstract():247 -> F
-    1:2:boolean isClassInitializer():270:271 -> G
+    2:2:boolean isAbstract():248 -> F
+    1:2:boolean isClassInitializer():271:272 -> G
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> G
-    3:3:boolean isClassInitializer():271 -> G
-    4:4:boolean isClassInitializer():271:271 -> G
+    3:3:boolean isClassInitializer():272 -> G
+    4:4:boolean isClassInitializer():272:272 -> G
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> G
-    5:5:boolean isClassInitializer():271 -> G
-    1:1:boolean isDefaultMethod():276:276 -> H
-    1:2:boolean isDirectMethod():321:322 -> I
+    5:5:boolean isClassInitializer():272 -> G
+    1:1:boolean isDefaultMethod():277:277 -> H
+    1:2:boolean isDirectMethod():322:323 -> I
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> I
-    3:3:boolean isDirectMethod():322 -> I
-    4:4:boolean isDirectMethod():322:322 -> I
+    3:3:boolean isDirectMethod():323 -> I
+    4:4:boolean isDirectMethod():323:323 -> I
     5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> I
-    5:5:boolean isDirectMethod():322 -> I
-    6:6:boolean isDirectMethod():322:322 -> I
+    5:5:boolean isDirectMethod():323 -> I
+    6:6:boolean isDirectMethod():323:323 -> I
     7:7:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> I
-    7:7:boolean isDirectMethod():322 -> I
-    1:1:boolean isFinal():251:251 -> J
+    7:7:boolean isDirectMethod():323 -> I
+    1:1:boolean isFinal():252:252 -> J
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> J
-    2:2:boolean isFinal():251 -> J
-    1:2:boolean isInitializer():255:256 -> K
-    1:2:boolean isInstanceInitializer():260:261 -> L
+    2:2:boolean isFinal():252 -> J
+    1:2:boolean isInitializer():256:257 -> K
+    1:2:boolean isInstanceInitializer():261:262 -> L
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> L
-    3:3:boolean isInstanceInitializer():261 -> L
-    4:4:boolean isInstanceInitializer():261:261 -> L
+    3:3:boolean isInstanceInitializer():262 -> L
+    4:4:boolean isInstanceInitializer():262:262 -> L
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> L
-    5:5:boolean isInstanceInitializer():261 -> L
-    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():222:222 -> M
-    1:2:boolean isNonAbstractNonNativeMethod():298:299 -> N
+    5:5:boolean isInstanceInitializer():262 -> L
+    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():223:223 -> M
+    1:2:boolean isNonAbstractNonNativeMethod():299:300 -> N
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> N
-    3:3:boolean isNonAbstractNonNativeMethod():299 -> N
-    4:4:boolean isNonAbstractNonNativeMethod():299:299 -> N
+    3:3:boolean isNonAbstractNonNativeMethod():300 -> N
+    4:4:boolean isNonAbstractNonNativeMethod():300:300 -> N
     5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> N
-    5:5:boolean isNonAbstractNonNativeMethod():299 -> N
-    1:2:boolean isNonAbstractVirtualMethod():293:294 -> O
+    5:5:boolean isNonAbstractNonNativeMethod():300 -> N
+    1:2:boolean isNonAbstractVirtualMethod():294:295 -> O
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> O
-    3:3:boolean isNonAbstractVirtualMethod():294 -> O
-    1:1:boolean isObsolete():159:159 -> P
-    1:1:boolean isOnlyInlinedIntoNestMembers():346:346 -> Q
-    1:2:boolean isPrivateMethod():313:314 -> R
+    3:3:boolean isNonAbstractVirtualMethod():295 -> O
+    1:1:boolean isObsolete():160:160 -> P
+    1:1:boolean isOnlyInlinedIntoNestMembers():347:347 -> Q
+    1:2:boolean isPrivateMethod():314:315 -> R
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> R
-    3:3:boolean isPrivateMethod():314 -> R
-    1:2:boolean isProcessed():242:243 -> S
-    1:2:boolean isPublicized():303:304 -> T
-    1:2:boolean isStatic():327:328 -> U
+    3:3:boolean isPrivateMethod():315 -> R
+    1:2:boolean isProcessed():243:244 -> S
+    1:2:boolean isPublicized():304:305 -> T
+    1:2:boolean isStatic():328:329 -> U
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> U
-    3:3:boolean isStatic():328 -> U
-    1:2:boolean isVirtualMethod():284:285 -> V
+    3:3:boolean isStatic():329 -> U
+    1:2:boolean isVirtualMethod():285:286 -> V
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> V
-    3:3:boolean isVirtualMethod():285 -> V
-    4:4:boolean isVirtualMethod():285:285 -> V
+    3:3:boolean isVirtualMethod():286 -> V
+    4:4:boolean isVirtualMethod():286:286 -> V
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> V
-    5:5:boolean isVirtualMethod():285 -> V
-    6:6:boolean isVirtualMethod():285:285 -> V
+    5:5:boolean isVirtualMethod():286 -> V
+    6:6:boolean isVirtualMethod():286:286 -> V
     7:7:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
-    7:7:boolean isVirtualMethod():285 -> V
-    1:2:void markNotProcessed():415:416 -> W
-    1:2:java.lang.String qualifiedName():544:545 -> X
-    1:2:void removeCode():521:522 -> Y
-    1:5:void setLibraryMethodOverride():226:230 -> Z
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):79:79 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):79:79 -> a
-    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):234:236 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    7:7:boolean isVirtualMethod():286 -> V
+    1:2:void markNotProcessed():453:454 -> W
+    1:2:java.lang.String qualifiedName():582:583 -> X
+    1:2:void removeCode():559:560 -> Y
+    1:5:void setLibraryMethodOverride():227:231 -> Z
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
+    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
-    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1294 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295:1295 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1316 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295 -> a
-    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295:1295 -> a
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
     10:10:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295 -> a
-    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1296:1296 -> a
-    12:13:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):351:352 -> a
-    14:39:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):357:382 -> a
-    40:40:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):380:380 -> a
-    41:41:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):378:378 -> a
-    42:42:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):376:376 -> a
-    43:62:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):389:408 -> a
-    63:63:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):405:405 -> a
-    64:64:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):402:402 -> a
-    65:65:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):399:399 -> a
-    66:66:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):396:396 -> a
-    67:85:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):393:411 -> a
-    86:87:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):420:421 -> a
-    88:89:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):430:431 -> a
-    90:90:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
-    90:90:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):431 -> a
-    91:91:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):434:434 -> a
-    92:92:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):432:432 -> a
-    93:96:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):439:442 -> a
-    97:97:boolean hasParameterInfo():467:467 -> a
-    97:97:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442 -> a
-    98:99:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442:443 -> a
-    100:101:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):462:463 -> a
-    100:101:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):443 -> a
-    102:102:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):445:445 -> a
-    103:105:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):449:451 -> a
-    106:107:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):483:484 -> a
-    108:108:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    108:108:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):484 -> a
-    109:110:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):485:486 -> a
-    111:111:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
-    111:111:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):486 -> a
-    112:112:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):488:488 -> a
-    113:113:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    113:113:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):488 -> a
-    114:114:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):489:489 -> a
-    115:115:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
-    115:115:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):489 -> a
-    116:116:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):494:494 -> a
-    117:122:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):499:504 -> a
-    123:131:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):554:562 -> a
-    132:137:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):566:571 -> a
-    138:138:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
-    138:138:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):571 -> a
-    139:140:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):571:572 -> a
-    141:141:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
-    141:141:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
-    141:141:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572 -> a
-    142:148:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572:578 -> a
-    149:157:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
-    149:157:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    158:158:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    158:158:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
-    158:158:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    159:160:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
-    159:160:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    161:161:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    161:161:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
-    161:161:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    162:162:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
-    162:162:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    163:163:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    163:163:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
-    163:163:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    164:169:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
-    164:169:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    170:170:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    170:170:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
-    170:170:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    171:174:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
-    171:174:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    175:175:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    175:175:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
-    175:175:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    176:182:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
-    176:182:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    183:183:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    183:183:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
-    183:183:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    184:185:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
-    184:185:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    186:186:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    186:186:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
-    186:186:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    187:190:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
-    187:190:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    191:191:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
-    191:191:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
-    191:191:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    192:213:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
-    192:213:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    214:217:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579:582 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
-    218:218:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
-    218:218:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):572 -> a
-    219:219:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):609:609 -> a
-    220:220:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
-    220:220:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):610 -> a
-    221:223:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):611:613 -> a
-    224:224:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    224:224:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):613 -> a
-    225:229:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):614:618 -> a
-    230:231:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):673:674 -> a
-    232:233:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):693:694 -> a
-    232:233:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    234:234:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    234:234:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):694 -> a
-    234:234:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    235:237:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):695:697 -> a
-    235:237:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    238:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):696:700 -> a
-    238:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    243:243:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):703 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):703:703 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):702:702 -> a
-    245:245:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    246:246:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):704 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    247:250:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):705:708 -> a
-    247:250:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    251:266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):706:721 -> a
-    251:266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    267:267:void setObsolete():165:165 -> a
-    267:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):722 -> a
-    267:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):723:723 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    269:269:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676:676 -> a
-    270:271:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):727:728 -> a
-    270:271:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    272:272:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    272:272:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):728 -> a
-    272:272:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    273:275:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):729:731 -> a
-    273:275:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    276:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):730:732 -> a
-    276:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    279:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):733 -> a
-    279:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    280:284:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):734:738 -> a
-    280:284:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    285:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):735:743 -> a
-    285:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    294:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):740:740 -> a
-    294:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    295:295:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    295:295:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):744 -> a
-    295:295:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    296:299:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):745:748 -> a
-    296:299:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    300:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):746:750 -> a
-    300:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    305:305:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):750 -> a
-    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    306:307:boolean isStaticMember():333:334 -> a
-    306:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):751 -> a
-    306:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    308:330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):755:777 -> a
-    308:330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    331:331:void setObsolete():165:165 -> a
-    331:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778 -> a
-    331:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    332:332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:779 -> a
-    332:332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    333:337:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):681:685 -> a
-    338:342:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):684:688 -> a
-    343:343:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    343:343:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688 -> a
-    344:344:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688:688 -> a
-    345:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):783:784 -> a
-    347:361:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):788:802 -> a
-    362:362:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818:818 -> a
-    363:363:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    363:363:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818 -> a
-    364:380:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818:834 -> a
-    381:381:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    381:381:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):834 -> a
-    382:384:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):834:836 -> a
-    385:385:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    385:385:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):836 -> a
-    386:386:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837:837 -> a
-    387:387:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    387:387:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837 -> a
-    388:388:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838:838 -> a
-    389:389:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
-    389:389:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838 -> a
-    390:390:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):839:839 -> a
-    391:396:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):844:849 -> a
-    397:420:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):846:869 -> a
-    421:421:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):854:854 -> a
-    422:425:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):857:860 -> a
-    426:426:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    426:426:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    426:426:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    427:427:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    427:427:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    428:430:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):862:864 -> a
-    431:431:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    431:431:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864 -> a
-    432:433:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864:865 -> a
-    434:436:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):873:875 -> a
-    437:440:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):885:888 -> a
-    441:441:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    441:441:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):888 -> a
-    442:442:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):889:889 -> a
-    443:443:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> a
-    443:443:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):889 -> a
-    444:444:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):890:890 -> a
-    445:445:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    445:445:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):890 -> a
-    446:448:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):891:893 -> a
-    449:453:void lambda$toEmulateInterfaceLibraryMethod$3(com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):904:908 -> a
-    454:459:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):946:951 -> a
-    460:460:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
-    460:460:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
-    460:460:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):951 -> a
-    461:462:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):953:954 -> a
-    463:463:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    463:463:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):954 -> a
-    464:467:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):954:957 -> a
-    468:468:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    468:468:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):957 -> a
-    469:469:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):960:960 -> a
-    470:470:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
-    470:470:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):960 -> a
-    471:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:967 -> a
-    476:476:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):967 -> a
-    477:478:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):967:968 -> a
-    479:479:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    479:479:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968 -> a
-    480:494:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968:982 -> a
-    495:495:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
-    495:495:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
-    496:496:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984:984 -> a
-    497:497:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    497:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):987:987 -> a
-    499:510:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1004:1015 -> a
-    511:521:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1014:1024 -> a
-    522:525:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1065:1068 -> a
-    526:526:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    526:526:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1068 -> a
-    527:527:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1070:1070 -> a
-    528:529:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1146:1147 -> a
-    530:530:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1169:1169 -> a
-    531:532:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> a
-    531:532:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171 -> a
-    533:537:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171:1175 -> a
-    538:538:boolean hasSingleTarget():1318:1318 -> a
-    539:540:void forEachTarget(java.util.function.Consumer):1330:1331 -> a
-    1:1:void setObsolete():165:165 -> a0
-    1:4:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):173:176 -> b
-    5:6:com.android.tools.r8.graph.Code getCode():516:517 -> b
-    5:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176 -> b
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> b
+    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
+    12:13:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:356 -> a
+    14:71:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:422 -> a
+    72:75:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:413 -> a
+    76:79:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):403:406 -> a
+    80:83:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):396:399 -> a
+    84:113:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):389:418 -> a
+    114:133:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):427:446 -> a
+    134:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):443:443 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):440:440 -> a
+    136:136:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):437:437 -> a
+    137:137:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):434:434 -> a
+    138:156:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):431:449 -> a
+    157:158:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):458:459 -> a
+    159:160:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):468:469 -> a
+    161:161:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
+    161:161:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):469 -> a
+    162:162:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):472:472 -> a
+    163:163:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):470:470 -> a
+    164:167:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):477:480 -> a
+    168:168:boolean hasParameterInfo():505:505 -> a
+    168:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480 -> a
+    169:170:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480:481 -> a
+    171:172:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):500:501 -> a
+    171:172:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):481 -> a
+    173:173:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):483:483 -> a
+    174:176:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):487:489 -> a
+    177:178:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:522 -> a
+    179:179:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    179:179:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522 -> a
+    180:181:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):523:524 -> a
+    182:182:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    182:182:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):524 -> a
+    183:183:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):526:526 -> a
+    184:184:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    184:184:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):526 -> a
+    185:185:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):527:527 -> a
+    186:186:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    186:186:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):527 -> a
+    187:187:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):532:532 -> a
+    188:193:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):537:542 -> a
+    194:202:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):592:600 -> a
+    203:208:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:609 -> a
+    209:209:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
+    209:209:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):609 -> a
+    210:211:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):609:610 -> a
+    212:212:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    212:212:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    212:212:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610 -> a
+    213:219:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610:616 -> a
+    220:228:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
+    220:228:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    229:229:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    229:229:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
+    229:229:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    230:231:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
+    230:231:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    232:232:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    232:232:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
+    232:232:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    233:233:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
+    233:233:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    234:234:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    234:234:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
+    234:234:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    235:240:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
+    235:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    241:241:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    241:241:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
+    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    242:245:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
+    242:245:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    246:246:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
+    246:246:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    247:253:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
+    247:253:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    254:254:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    254:254:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
+    254:254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    255:256:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
+    255:256:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    257:257:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
+    257:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    258:261:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
+    258:261:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    262:262:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    262:262:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
+    262:262:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    263:284:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
+    263:284:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    285:288:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617:620 -> a
+    289:289:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    289:289:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    289:289:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):610 -> a
+    290:290:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:647 -> a
+    291:291:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    291:291:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):648 -> a
+    292:294:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):649:651 -> a
+    295:295:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    295:295:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):651 -> a
+    296:300:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):652:656 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):711:712 -> a
+    303:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):731:732 -> a
+    303:304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    305:305:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):732 -> a
+    305:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    306:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):733:735 -> a
+    306:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):734:738 -> a
+    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    314:314:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):741 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):741:741 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    316:316:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):740:740 -> a
+    316:316:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    317:317:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    317:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):742 -> a
+    317:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    318:321:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):743:746 -> a
+    318:321:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    322:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):744:759 -> a
+    322:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    338:338:void setObsolete():166:166 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):760 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    339:339:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):761:761 -> a
+    339:339:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    340:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714:714 -> a
+    341:342:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):765:766 -> a
+    341:342:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    343:343:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    343:343:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
+    343:343:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    344:346:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
+    344:346:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    347:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:770 -> a
+    347:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    350:350:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    350:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):771 -> a
+    350:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    351:355:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):772:776 -> a
+    351:355:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    356:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
+    356:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    365:365:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:778 -> a
+    365:365:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    366:366:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    366:366:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):782 -> a
+    366:366:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    367:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):783:786 -> a
+    367:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    371:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784:788 -> a
+    371:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    376:376:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):788 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    377:378:boolean isStaticMember():334:335 -> a
+    377:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):789 -> a
+    377:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    379:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):793:815 -> a
+    379:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    402:402:void setObsolete():166:166 -> a
+    402:402:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):816 -> a
+    402:402:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    403:403:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):817:817 -> a
+    403:403:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    404:408:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):719:723 -> a
+    409:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):722:726 -> a
+    414:414:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    414:414:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726 -> a
+    415:415:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726:726 -> a
+    416:417:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):821:822 -> a
+    418:432:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):826:840 -> a
+    433:433:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:856 -> a
+    434:434:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    434:434:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> a
+    435:451:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:872 -> a
+    452:452:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    452:452:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872 -> a
+    453:455:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:874 -> a
+    456:456:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    456:456:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):874 -> a
+    457:457:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875:875 -> a
+    458:458:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    458:458:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876:876 -> a
+    460:460:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    460:460:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876 -> a
+    461:461:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):877:877 -> a
+    462:467:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):882:887 -> a
+    468:491:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:907 -> a
+    492:492:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):892:892 -> a
+    493:496:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:898 -> a
+    497:497:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    497:497:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    497:497:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    498:498:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    498:498:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    499:501:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):900:902 -> a
+    502:502:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    502:502:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902 -> a
+    503:504:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902:903 -> a
+    505:507:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):911:913 -> a
+    508:511:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):922:925 -> a
+    512:512:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    512:512:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):925 -> a
+    513:513:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):926:926 -> a
+    514:514:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> a
+    514:514:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):926 -> a
+    515:515:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):927:927 -> a
+    516:516:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    516:516:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):927 -> a
+    517:521:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):928:932 -> a
+    522:526:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):929:933 -> a
+    527:532:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968:973 -> a
+    533:533:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    533:533:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    533:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):973 -> a
+    534:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):975:976 -> a
+    536:536:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):976 -> a
+    537:540:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):976:979 -> a
+    541:541:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    541:541:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):979 -> a
+    542:542:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982:982 -> a
+    543:543:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    543:543:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
+    544:548:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:989 -> a
+    549:549:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    549:549:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):989 -> a
+    550:551:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):989:990 -> a
+    552:552:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    552:552:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):990 -> a
+    553:567:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):990:1004 -> a
+    568:568:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    568:568:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004 -> a
+    569:569:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006:1006 -> a
+    570:570:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    570:570:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006 -> a
+    571:571:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1009:1009 -> a
+    572:583:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1026:1037 -> a
+    584:594:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1036:1046 -> a
+    595:598:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1087:1090 -> a
+    599:599:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    599:599:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090 -> a
+    600:600:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1092:1092 -> a
+    601:602:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1168:1169 -> a
+    603:603:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1191 -> a
+    604:605:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> a
+    604:605:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193 -> a
+    606:610:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193:1197 -> a
+    611:611:boolean hasSingleTarget():1340:1340 -> a
+    612:613:void forEachTarget(java.util.function.Consumer):1352:1353 -> a
+    1:1:void setObsolete():166:166 -> a0
+    1:4:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):174:177 -> b
+    5:6:com.android.tools.r8.graph.Code getCode():554:555 -> b
+    5:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177:178 -> b
     9:9:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    9:9:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
-    10:11:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178:179 -> b
-    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):455:458 -> b
-    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> b
-    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458 -> b
-    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458:458 -> b
-    19:22:void upgradeClassFileVersion(int):537:540 -> b
-    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915:915 -> b
+    9:9:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178 -> b
+    10:11:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):179:180 -> b
+    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):493:496 -> b
+    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> b
+    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496 -> b
+    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496:496 -> b
+    19:22:void upgradeClassFileVersion(int):575:578 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:937 -> b
     24:24:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> b
-    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915 -> b
-    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915:922 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937 -> b
+    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:944 -> b
     33:33:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):922 -> b
-    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):922:924 -> b
+    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):944 -> b
+    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):944:946 -> b
     37:37:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):924 -> b
-    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):924:936 -> b
+    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):946 -> b
+    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):946:958 -> b
     51:51:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> b
-    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):936 -> b
-    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:937 -> b
+    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):958 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:959 -> b
     53:53:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> b
-    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):938:938 -> b
+    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960:960 -> b
     55:55:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> b
-    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):938 -> b
-    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939:942 -> b
-    60:60:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):976:976 -> b
+    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960 -> b
+    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:964 -> b
+    60:60:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):998:998 -> b
     61:61:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    61:61:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):976 -> b
-    62:64:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):977:979 -> b
-    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1312:1312 -> b
-    1:1:boolean shouldNotHaveCode():508:508 -> b0
+    61:61:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):998 -> b
+    62:64:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):999:1001 -> b
+    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1334:1334 -> b
+    1:1:boolean shouldNotHaveCode():546:546 -> b0
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b0
-    2:2:boolean shouldNotHaveCode():508 -> b0
-    3:3:boolean shouldNotHaveCode():508:508 -> b0
+    2:2:boolean shouldNotHaveCode():546 -> b0
+    3:3:boolean shouldNotHaveCode():546:546 -> b0
     4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> b0
-    4:4:boolean shouldNotHaveCode():508 -> b0
-    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> c
-    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):833:833 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1306:1306 -> c
-    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():592:595 -> c0
+    4:4:boolean shouldNotHaveCode():546 -> b0
+    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> c
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):871:871 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1328:1328 -> c
+    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:633 -> c0
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> c0
-    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():595 -> c0
-    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():595:597 -> c0
+    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633 -> c0
+    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633:635 -> c0
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():597 -> c0
-    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():597:598 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635 -> c0
+    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635:636 -> c0
     12:12:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():598 -> c0
-    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():599:599 -> c0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> d
-    2:2:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):930:930 -> d
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> c0
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> c0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> d
+    2:2:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):952:952 -> d
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
-    3:3:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):930 -> d
-    4:6:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):931:933 -> d
-    7:7:boolean isValidVirtualTargetForDynamicDispatch():1301:1301 -> d
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():663:669 -> d0
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> e
-    2:3:java.util.List asListOfTargets():1324:1325 -> e
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():639:648 -> e0
-    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> f
-    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():991:992 -> f0
+    3:3:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):952 -> d
+    4:6:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):953:955 -> d
+    7:7:boolean isValidVirtualTargetForDynamicDispatch():1323:1323 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():701:707 -> d0
+    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> e
+    2:3:java.util.List asListOfTargets():1346:1347 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():677:686 -> e0
+    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> f
+    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1013:1014 -> f0
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> f0
-    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():992 -> f0
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():992:996 -> f0
-    9:9:void setObsolete():165:165 -> f0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():997 -> f0
-    1:2:java.lang.String toSourceString():587:588 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1180:1180 -> g
-    1:1:void unsetObsolete():192:192 -> g0
-    1:1:void checkIfObsolete():153:153 -> h0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1055:1055 -> j
-    1:1:boolean isDexEncodedMethod():1049:1049 -> m
-    1:2:boolean isStaticMember():333:334 -> n
-    1:2:com.android.tools.r8.graph.DexReference toReference():1043:1044 -> o
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> p
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> p
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():79 -> p
-    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():652:653 -> q
+    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1014 -> f0
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1014:1018 -> f0
+    9:9:void setObsolete():166:166 -> f0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1019 -> f0
+    1:2:java.lang.String toSourceString():625:626 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1202:1202 -> g
+    1:1:void unsetObsolete():193:193 -> g0
+    1:1:void checkIfObsolete():154:154 -> h0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1077:1077 -> j
+    1:1:boolean isDexEncodedMethod():1071:1071 -> m
+    1:2:boolean isStaticMember():334:335 -> n
+    1:2:com.android.tools.r8.graph.DexReference toReference():1065:1066 -> o
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> p
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> p
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():80 -> p
+    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:691 -> q
     3:3:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> q
-    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():656 -> q
-    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():657:659 -> q
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():628:629 -> r
-    1:2:java.lang.String codeToString():1030:1031 -> s
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1151:1152 -> t
-    1:2:java.lang.String toString():476:477 -> toString
-    1:3:int getClassFileVersion():526:528 -> u
-    1:2:com.android.tools.r8.graph.Code getCode():516:517 -> v
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():169:169 -> w
-    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1157:1165 -> x
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1138:1142 -> y
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> z
+    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():694 -> q
+    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():695:697 -> q
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():666:667 -> r
+    1:2:java.lang.String codeToString():1052:1053 -> s
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1173:1174 -> t
+    1:2:java.lang.String toString():514:515 -> toString
+    1:3:int getClassFileVersion():564:566 -> u
+    1:2:com.android.tools.r8.graph.Code getCode():554:555 -> v
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():170:170 -> w
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1179:1187 -> x
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1160:1164 -> y
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.s0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():391:391 -> <clinit>
-    2:2:void <clinit>():372:372 -> <clinit>
+    1:1:void <clinit>():429:429 -> <clinit>
+    2:2:void <clinit>():384:384 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17993,31 +18005,31 @@
     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>():1183:1183 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1183:1183 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1194:1210 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1206:1206 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1183:1183 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1215:1215 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1224:1243 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1243 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1248 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246 -> a
-    28:28:void setCode(com.android.tools.r8.graph.Code):1273:1273 -> a
-    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1277:1282 -> a
+    1:1:void <clinit>():1205:1205 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1205:1205 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1216:1232 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1228:1228 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1205:1205 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1265 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1265 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268:1270 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268 -> a
+    28:28:void setCode(com.android.tools.r8.graph.Code):1295:1295 -> a
+    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1299:1304 -> a
     35:35:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    35:35:com.android.tools.r8.graph.DexEncodedMethod build():1282 -> a
-    36:42:com.android.tools.r8.graph.DexEncodedMethod build():1281:1287 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253:1253 -> b
+    35:35:com.android.tools.r8.graph.DexEncodedMethod build():1304 -> a
+    36:42:com.android.tools.r8.graph.DexEncodedMethod build():1303:1309 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275:1275 -> b
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1258:1258 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1263:1267 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1280:1280 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1285:1289 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1082:1083 -> <init>
+    1:2:void <init>(boolean):1104:1105 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.v0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -18027,28 +18039,28 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():93:116 -> <clinit>
-    25:25:void <clinit>():89:89 -> <clinit>
-    1:1:void <init>(java.lang.String,int):89:89 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():89:89 -> a
+    1:24:void <clinit>():94:117 -> <clinit>
+    25:25:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.lang.String,int):90:90 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.y0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1087:1087 -> <init>
-    2:2:void <init>():1089:1089 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1109:1109 -> <init>
+    2:2:void <init>():1111:1111 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1121:1122 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1104:1104 -> <clinit>
-    1:1:void <init>():1107:1107 -> <init>
+    1:1:void <clinit>():1126:1126 -> <clinit>
+    1:1:void <init>():1129:1129 -> <init>
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
-    com.android.tools.r8.graph.DexString name -> f
-    com.android.tools.r8.graph.DexType holder -> d
-    com.android.tools.r8.graph.DexType type -> e
+    com.android.tools.r8.graph.DexString name -> g
+    com.android.tools.r8.graph.DexType type -> f
+    com.android.tools.r8.graph.DexType holder -> e
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):17:23 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):10:10 -> a
     2:2:boolean match(com.android.tools.r8.graph.DexItem):10:10 -> a
@@ -18059,17 +18071,17 @@
     9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):63:63 -> a
     10:18:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:109 -> a
-    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113:113 -> a
     22:22:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     22:22:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
     23:23:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117:117 -> a
-    24:24:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    24:24:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     24:24:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117 -> a
     25:25:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     25:25:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
-    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     26:26:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     27:27:boolean match(com.android.tools.r8.graph.DexEncodedField):127:127 -> a
     28:28:boolean match(com.android.tools.r8.graph.DexField):122:122 -> a
@@ -18079,12 +18091,12 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexField):78:78 -> compareTo
     2:2:int compareTo(java.lang.Object):10 -> compareTo
     1:1:java.lang.String toSmaliString():136:136 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     2:2:java.lang.String toSmaliString():136 -> f
     3:3:java.lang.String toSmaliString():136:136 -> f
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    4:4:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     4:4:java.lang.String toSmaliString():136 -> f
     5:5:java.lang.String toSmaliString():136:136 -> f
     1:1:java.lang.String toSourceString():141:141 -> g
@@ -18112,388 +18124,394 @@
     1:1:java.lang.String toSmaliString():60:60 -> f
     1:1:java.lang.String toSourceString():64:64 -> g
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.U0:
-    com.android.tools.r8.graph.DexString newInstanceName -> A0
+    com.android.tools.r8.graph.DexString getMethodName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> b1
-    com.android.tools.r8.graph.DexType mapType -> F2
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
+    com.android.tools.r8.graph.DexType proxyType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> I0
-    com.android.tools.r8.graph.DexString mapDescriptor -> j1
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> R3
-    com.android.tools.r8.graph.DexString getNameName -> r0
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> I0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> j1
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> s3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType boxedByteType -> V1
-    com.android.tools.r8.graph.DexType stringBufferType -> w2
+    com.android.tools.r8.graph.DexType longType -> V1
+    com.android.tools.r8.graph.DexType classType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> z0
-    com.android.tools.r8.graph.DexType charType -> N1
-    com.android.tools.r8.graph.DexType iterableType -> o2
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> Z3
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> z0
+    java.util.Set libraryClassesWithoutStaticInitialization -> g4
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> U3
+    com.android.tools.r8.graph.DexType iteratorType -> O3
+    com.android.tools.r8.graph.DexType charArrayType -> N1
+    com.android.tools.r8.graph.DexType enumType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType callSiteType -> G3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    com.android.tools.r8.graph.DexType stringArrayType -> g2
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> I1
-    java.util.Set libraryMethodsReturningReceiver -> V3
+    com.android.tools.r8.graph.DexType boxedNumberType -> g2
+    com.android.tools.r8.graph.DexString newUpdaterName -> I1
     com.android.tools.r8.graph.DexString toStringMethodName -> i0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> b3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> h3
-    com.android.tools.r8.graph.DexString fieldDescriptor -> Q0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> r1
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> f3
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Q0
+    com.android.tools.r8.graph.DexString callableDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> x3
-    java.util.IdentityHashMap internalSentinels -> e4
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> W2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> x3
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> Y0
-    com.android.tools.r8.graph.DexString npeDescriptor -> z1
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> O2
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> A1
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString icceDescriptor -> z1
+    com.android.tools.r8.graph.DexType supplierType -> O2
+    boolean $assertionsDisabled -> l4
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> t3
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> A1
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexString setDescriptor -> i1
-    com.android.tools.r8.graph.DexType setType -> E2
-    com.android.tools.r8.graph.DexString stringDescriptor -> H0
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Q3
-    com.android.tools.r8.graph.DexString constructorDescriptor -> P0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> q1
-    com.android.tools.r8.graph.DexString forNameMethodName -> q0
-    com.android.tools.r8.graph.DexType boxedBooleanType -> U1
-    com.android.tools.r8.graph.DexType stringBuilderType -> v2
+    com.android.tools.r8.graph.DexString proxyDescriptor -> i1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> E2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> d3
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> H0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> P0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> q1
+    com.android.tools.r8.graph.DexString nameMethodName -> q0
+    com.android.tools.r8.graph.DexType intType -> U1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexString getMethodName -> y0
-    com.android.tools.r8.graph.DexType byteType -> M1
-    com.android.tools.r8.graph.DexType collectionsType -> n2
-    com.android.tools.r8.graph.DexType comparableType -> N3
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> a1
-    com.android.tools.r8.graph.DexType stringType -> f2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> Y2
+    com.android.tools.r8.graph.DexString getFieldName -> y0
+    java.util.Set libraryTypesAssumedToBePresent -> f4
+    com.android.tools.r8.graph.DexType classArrayType -> n2
+    com.android.tools.r8.graph.DexType lookupType -> N3
+    com.android.tools.r8.graph.DexString mathDescriptor -> a1
+    com.android.tools.r8.graph.DexType boxedShortType -> f2
+    com.android.tools.r8.graph.DexString unknownTypeName -> j4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
     com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    com.android.tools.r8.graph.DexString thisName -> H1
-    com.android.tools.r8.graph.DexType metafactoryType -> F3
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> p0
-    com.android.tools.r8.graph.DexType annotationSignature -> w3
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> F3
+    com.android.tools.r8.graph.DexString ordinalMethodName -> p0
+    com.android.tools.r8.graph.DexType icceType -> V2
+    com.android.tools.r8.graph.DexType annotationDefault -> w3
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    com.android.tools.r8.graph.DexString mathDescriptor -> X0
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> y1
-    com.android.tools.r8.graph.DexType throwableType -> N2
-    com.android.tools.r8.graph.DexString invokeMethodName -> C0
-    java.util.Set libraryClassesWithoutStaticInitialization -> a4
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> d1
-    boolean $assertionsDisabled -> f4
+    com.android.tools.r8.graph.DexString objectsDescriptor -> X0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> y1
+    com.android.tools.r8.graph.DexType callableType -> N2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> a4
+    com.android.tools.r8.graph.DexString newInstanceName -> C0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> d1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> p3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType listType -> D2
+    com.android.tools.r8.graph.DexType methodTypeType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> m3
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> K0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> l1
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> T3
+    com.android.tools.r8.graph.DexString stringDescriptor -> K0
+    com.android.tools.r8.graph.DexString listDescriptor -> l1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> k3
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getSimpleNameName -> t0
+    com.android.tools.r8.graph.DexString getNameName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> X2
-    com.android.tools.r8.graph.DexType voidType -> T1
-    com.android.tools.r8.graph.DexType autoCloseableType -> u2
-    com.android.tools.r8.graph.DexType externalizableType -> M3
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> i3
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> q3
+    com.android.tools.r8.graph.DexType floatType -> T1
+    com.android.tools.r8.graph.DexType strictMathType -> u2
+    com.android.tools.r8.graph.DexType callSiteType -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType booleanType -> L1
-    com.android.tools.r8.graph.DexType objectsType -> m2
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> C1
+    com.android.tools.r8.graph.DexType objectArrayType -> m2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> n3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> C1
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> e2
+    com.android.tools.r8.graph.DexType boxedLongType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> E3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> K1
+    com.android.tools.r8.graph.DexType annotationThrows -> E3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
     com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexString enumDescriptor -> S0
-    com.android.tools.r8.graph.DexString throwableDescriptor -> t1
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> u3
+    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> U2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> v3
-    com.android.tools.r8.graph.DexType optionalType -> M2
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> U2
+    com.android.tools.r8.graph.DexType comparatorType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> c1
-    com.android.tools.r8.graph.DexString assertionsDisabled -> B0
-    com.android.tools.r8.graph.DexType serviceLoaderType -> C2
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> k1
-    com.android.tools.r8.graph.DexString objectDescriptor -> J0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> c1
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> B0
+    java.util.Map libraryMethodsWithoutSideEffects -> d4
+    com.android.tools.r8.graph.DexType methodHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> s0
-    com.android.tools.r8.graph.DexType shortType -> S1
-    com.android.tools.r8.graph.DexType classLoaderType -> t2
+    com.android.tools.r8.graph.DexString forNameMethodName -> s0
+    com.android.tools.r8.graph.DexType doubleType -> S1
+    com.android.tools.r8.graph.DexType mathType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> a3
-    com.android.tools.r8.graph.DexType annotationType -> l2
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> h3
+    com.android.tools.r8.graph.DexType comparableType -> T3
+    com.android.tools.r8.graph.DexType objectType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType serializableType -> L3
+    com.android.tools.r8.graph.DexType metafactoryType -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> B1
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> f3
-    com.android.tools.r8.graph.DexType charSequenceType -> d2
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> D3
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> i3
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> B1
+    com.android.tools.r8.graph.DexType boxedIntType -> d2
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> D3
     com.android.tools.r8.graph.DexString internMethodName -> j0
+    com.android.tools.r8.graph.DexString constructorMethodName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    java.util.Set libraryMethodsReturningNonNull -> W3
-    com.android.tools.r8.graph.DexString methodDescriptor -> R0
-    com.android.tools.r8.graph.DexString arraysDescriptor -> s1
-    com.android.tools.r8.graph.DexType npeType -> T2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> u3
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> R0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> s1
+    com.android.tools.r8.graph.DexType throwableType -> T2
     java.util.concurrent.ConcurrentHashMap types -> b
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Z0
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> P3
-    com.android.tools.r8.graph.DexType runnableType -> L2
-    com.android.tools.r8.graph.DexString unknownTypeName -> d4
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> e3
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> E0
-    com.android.tools.r8.graph.DexString proxyDescriptor -> f1
-    com.android.tools.r8.graph.DexType proxyType -> B2
+    com.android.tools.r8.graph.DexString iterableDescriptor -> Z0
+    com.android.tools.r8.graph.DexType mapEntryType -> L2
+    boolean skipNameValidationForTesting -> h4
+    com.android.tools.r8.graph.DexString invokeMethodName -> E0
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType varHandleType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> o3
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> M0
-    com.android.tools.r8.graph.DexString callableDescriptor -> n1
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> k3
-    com.android.tools.r8.graph.DexType boxedIntType -> Z1
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> c3
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> v0
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> S3
-    com.android.tools.r8.graph.DexType longType -> R1
-    com.android.tools.r8.graph.DexType classType -> s2
+    com.android.tools.r8.graph.DexString objectDescriptor -> M0
+    com.android.tools.r8.graph.DexString mapDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedByteType -> Z1
+    com.android.tools.r8.graph.DexString getSimpleNameName -> v0
+    com.android.tools.r8.graph.DexType externalizableType -> S3
+    com.android.tools.r8.graph.DexType charType -> R1
+    com.android.tools.r8.graph.DexType iterableType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType charArrayType -> J1
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> Z2
-    com.android.tools.r8.graph.DexType enumerationType -> K3
-    com.android.tools.r8.graph.DexType enumType -> k2
-    com.android.tools.r8.graph.DexString newUpdaterName -> E1
-    java.util.Set libraryTypesAssumedToBePresent -> Z3
+    java.util.Set libraryMethodsReturningNonNull -> c4
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> K3
+    com.android.tools.r8.graph.DexType stringArrayType -> k2
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> C3
-    com.android.tools.r8.graph.DexType boxedNumberType -> c2
+    com.android.tools.r8.graph.DexType annotationSignature -> C3
+    com.android.tools.r8.graph.DexType boxedFloatType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> l3
-    com.android.tools.r8.graph.DexString finalizeMethodName -> m0
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> p3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> V2
-    com.android.tools.r8.graph.DexString objectsDescriptor -> U0
-    com.android.tools.r8.graph.DexString icceDescriptor -> v1
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> S2
-    com.android.tools.r8.graph.DexType annotationInnerClass -> t3
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> M1
+    com.android.tools.r8.graph.DexString initMethodName -> m0
+    com.android.tools.r8.graph.DexString methodDescriptor -> U0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> v1
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> S2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> e3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType consumerType -> K2
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> e1
-    com.android.tools.r8.graph.DexType callableType -> I2
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> D0
+    com.android.tools.r8.graph.DexType mapType -> K2
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> e1
+    com.android.tools.r8.graph.DexType listType -> I2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexString classDescriptor -> L0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> m1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> A2
-    com.android.tools.r8.graph.DexType boxedFloatType -> Y1
-    com.android.tools.r8.graph.DexType methodTypeType -> z2
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> g3
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> U3
-    com.android.tools.r8.graph.DexString getTypeNameName -> u0
-    com.android.tools.r8.graph.DexType intType -> Q1
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> r2
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> L0
+    com.android.tools.r8.graph.DexString setDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBufferType -> A2
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Y1
+    com.android.tools.r8.graph.DexType stringBuilderType -> z2
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> u0
+    com.android.tools.r8.graph.DexType byteType -> Q1
+    com.android.tools.r8.graph.DexType collectionsType -> r2
+    com.android.tools.r8.graph.DexType serializableType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexType classArrayType -> j2
+    java.util.Set libraryMethodsReturningReceiver -> b4
+    com.android.tools.r8.graph.DexType stringType -> j2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> g3
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> V3
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> D1
-    com.android.tools.r8.graph.DexType listIteratorType -> J3
+    com.android.tools.r8.graph.DexString npeDescriptor -> D1
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> J3
     java.util.Map setFiles -> n
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Y3
-    com.android.tools.r8.graph.DexType boxedShortType -> b2
-    com.android.tools.r8.graph.DexType nullValueType -> c4
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> d3
-    com.android.tools.r8.graph.DexString getClassMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> B3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> b2
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> l3
+    com.android.tools.r8.graph.DexString wrapperFieldName -> l0
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> B3
+    com.android.tools.r8.graph.DexString thisName -> L1
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> o3
+    com.android.tools.r8.graph.DexType npeType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexString annotationDescriptor -> T0
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> u1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> W2
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> R2
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> s3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> T0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> u1
+    com.android.tools.r8.graph.DexType optionalType -> R2
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType supplierType -> J2
-    com.android.tools.r8.graph.DexType comparatorType -> H2
+    com.android.tools.r8.graph.DexType setType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> G0
-    com.android.tools.r8.graph.DexString listDescriptor -> h1
-    boolean skipNameValidationForTesting -> b4
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> p1
-    com.android.tools.r8.graph.DexType boxedDoubleType -> X1
-    com.android.tools.r8.graph.DexType methodHandleType -> y2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> G0
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> h1
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> a3
+    com.android.tools.r8.graph.DexString classDescriptor -> O0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> p1
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Y3
+    com.android.tools.r8.graph.DexType voidType -> X1
+    com.android.tools.r8.graph.DexType autoCloseableType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> x0
-    com.android.tools.r8.graph.DexType floatType -> P1
-    com.android.tools.r8.graph.DexType strictMathType -> q2
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> O3
-    com.android.tools.r8.graph.DexType objectArrayType -> i2
-    com.android.tools.r8.graph.DexType iteratorType -> I3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> G1
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> X3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> x0
+    com.android.tools.r8.graph.DexType enumerationType -> Q3
+    com.android.tools.r8.graph.DexType booleanType -> P1
+    com.android.tools.r8.graph.DexType objectsType -> q2
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> e4
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> i2
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> I3
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType boxedLongType -> a2
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> A3
-    java.util.Map libraryMethodsWithoutSideEffects -> X3
-    com.android.tools.r8.graph.DexString nameMethodName -> o0
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> n3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> z3
+    com.android.tools.r8.graph.DexType boxedCharType -> a2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> A3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> O1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> r3
+    com.android.tools.r8.graph.DexString finalizeMethodName -> o0
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Y2
+    com.android.tools.r8.graph.DexType annotationInnerClass -> z3
+    java.util.IdentityHashMap internalSentinels -> k4
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString iterableDescriptor -> W0
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> x1
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Q2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> r3
-    com.android.tools.r8.graph.DexType mapEntryType -> G2
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> g1
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> F0
+    com.android.tools.r8.graph.DexString annotationDescriptor -> W0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> x1
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> v3
+    com.android.tools.r8.graph.DexType runnableType -> Q2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> G2
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> g1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> m3
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> N0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> o1
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType boxedCharType -> W1
-    com.android.tools.r8.graph.DexType varHandleType -> x2
+    com.android.tools.r8.graph.DexType shortType -> W1
+    com.android.tools.r8.graph.DexType classLoaderType -> x2
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> W3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString getFieldName -> w0
-    com.android.tools.r8.graph.DexType doubleType -> O1
-    com.android.tools.r8.graph.DexType mathType -> p2
-    com.android.tools.r8.graph.DexType objectType -> h2
-    com.android.tools.r8.graph.DexType lookupType -> H3
+    com.android.tools.r8.graph.DexString getTypeNameName -> w0
+    com.android.tools.r8.graph.DexType annotationType -> p2
+    com.android.tools.r8.graph.DexType listIteratorType -> P3
+    com.android.tools.r8.graph.DexType charSequenceType -> h2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> H3
+    com.android.tools.r8.graph.DexType nullValueType -> i4
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b3
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> j3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString constructorMethodName -> F1
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexString ordinalMethodName -> n0
-    com.android.tools.r8.graph.DexType annotationThrows -> y3
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> V0
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> w1
+    com.android.tools.r8.graph.DexString getClassMethodName -> n0
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> y3
+    com.android.tools.r8.graph.DexString enumDescriptor -> V0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType icceType -> P2
-    com.android.tools.r8.graph.DexType annotationDefault -> q3
-    com.android.tools.r8.kotlin.Kotlin kotlin -> j3
+    com.android.tools.r8.graph.DexType consumerType -> P2
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:355:void <init>():65:418 -> <init>
-    356:404:void <init>():408:456 -> <init>
-    405:421:void <init>():446:462 -> <init>
-    422:440:void <init>():459:477 -> <init>
-    441:461:void <init>():468:488 -> <init>
-    462:494:void <init>():481:513 -> <init>
-    495:499:void <init>():512:516 -> <init>
-    500:503:void <init>():515:518 -> <init>
-    504:541:void <init>():509:546 -> <init>
-    542:544:void <init>():106:108 -> <init>
-    545:545:void <init>():107:107 -> <init>
+    2:363:void <init>():65:426 -> <init>
+    364:412:void <init>():416:464 -> <init>
+    413:429:void <init>():454:470 -> <init>
+    430:448:void <init>():467:485 -> <init>
+    449:469:void <init>():476:496 -> <init>
+    470:502:void <init>():489:521 -> <init>
+    503:507:void <init>():520:524 -> <init>
+    508:511:void <init>():523:526 -> <init>
+    512:549:void <init>():517:554 -> <init>
+    550:552:void <init>():106:108 -> <init>
+    553:553:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):421:422 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):434:436 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):523:523 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):523:523 -> a
-    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1138:1139 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):429:430 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):442:444 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):531:531 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):531:531 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1153:1154 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139 -> a
-    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139:1140 -> a
-    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1145:1146 -> a
-    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1150:1151 -> a
-    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1187:1187 -> a
-    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1213:1214 -> a
-    22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214 -> a
-    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214:1214 -> a
-    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1205:1205 -> a
-    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1214 -> a
-    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1218:1220 -> a
-    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
-    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1228:1230 -> a
-    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1234:1237 -> a
-    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1303:1308 -> a
-    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1238 -> a
-    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1235:1235 -> a
-    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1242:1242 -> a
-    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252:1252 -> a
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154:1155 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1160:1161 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1165:1166 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1202:1202 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1228:1229 -> a
+    22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229:1229 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1220:1220 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1229 -> a
+    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1233:1235 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1243:1245 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1249:1252 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1318:1323 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1250:1250 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1257:1257 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267:1267 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252 -> a
-    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252:1253 -> a
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267:1268 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1255 -> a
-    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1254:1256 -> a
-    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1269:1273 -> a
-    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1290:1297 -> a
-    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1269:1271 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1284:1288 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1305:1312 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1299 -> a
-    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
-    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1299:1299 -> a
-    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
-    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1274:1280 -> a
-    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1279:1283 -> a
-    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1312:1314 -> a
-    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1325:1327 -> a
-    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1336:1337 -> a
-    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1345:1354 -> a
-    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1358:1360 -> a
-    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1396:1398 -> a
-    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1403:1405 -> a
-    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1413:1413 -> a
-    117:119:void clearTypeLatticeElementsCache():1417:1419 -> a
-    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1446:1453 -> a
-    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1452:1480 -> a
-    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1460:1468 -> a
-    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1467:1478 -> a
-    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1485:1486 -> a
-    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1489:1490 -> a
-    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1497:1501 -> a
-    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1498:1498 -> a
-    188:194:void sort(com.android.tools.r8.naming.NamingLens):1506:1512 -> a
-    195:195:void forAllTypes(java.util.function.Consumer):1529:1529 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1191:1197 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1196:1198 -> b
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1314 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1314:1314 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1289:1295 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1294:1298 -> a
+    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1327:1329 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1340:1342 -> a
+    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1351:1352 -> a
+    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1360:1369 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1373:1375 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1411:1413 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1418:1420 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1428:1428 -> a
+    117:119:void clearTypeLatticeElementsCache():1432:1434 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1461:1468 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1467:1495 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1475:1483 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1482:1493 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1500:1501 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1504:1505 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1512:1516 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1513:1513 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1521:1527 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1544:1544 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1206:1212 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1211:1213 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198:1199 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1205:1205 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1364:1366 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1388:1388 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1409:1409 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):557:557 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1155:1155 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1209:1209 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1370:1372 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1392:1392 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1186:1187 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1186:1186 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1376:1378 -> d
-    1:5:java.util.Collection extractMarker():1161:1165 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1382:1384 -> e
-    1:5:java.util.List extractMarkers():1175:1179 -> f
-    1:1:boolean getSkipNameValidationForTesting():553:553 -> g
-    1:10:void resetSortedIndices():1516:1525 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1423:1425 -> i
-    1:12:java.util.Set boxedValueOfMethods():431:442 -> j
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213:1214 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1220:1220 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1379:1381 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1403:1403 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1424:1424 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1170:1170 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1224:1224 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1385:1387 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1407:1407 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1201:1202 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1201:1201 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1391:1393 -> d
+    1:5:java.util.Collection extractMarker():1176:1180 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1397:1399 -> e
+    1:5:java.util.List extractMarkers():1190:1194 -> f
+    1:1:boolean getSkipNameValidationForTesting():561:561 -> g
+    1:10:void resetSortedIndices():1531:1540 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1438:1440 -> i
+    1:12:java.util.Set boxedValueOfMethods():439:450 -> j
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):600:600 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):604:609 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):615:615 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):619:624 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):814:814 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):820:839 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):843:843 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):829:829 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):835:854 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):858:858 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
@@ -18509,47 +18527,47 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getMembers -> m
     java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):643:643 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):660:689 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):643:643 -> a
-    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):693:693 -> a
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):697:697 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):658:658 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):675:704 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):658:658 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):708:708 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):712:712 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):701:701 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):705:707 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):716:716 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):720:722 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):715:715 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):722:742 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):737:757 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):570:570 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):574:578 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):578:578 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):582:586 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):584:584 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):560:560 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):564:566 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):565:565 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):568:568 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):572:574 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):573:573 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):750:750 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):754:756 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):765:765 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):769:771 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):614:614 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):621:628 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):629:629 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):636:643 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):633:633 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):637:639 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):638:638 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):648:648 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):652:654 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):653:653 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -18558,9 +18576,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):1026:1061 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1069:1079 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1086:1091 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1041:1076 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1084:1094 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1101:1106 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
@@ -18571,24 +18589,24 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):770:770 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):782:802 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):806:806 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):785:785 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):797:817 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):821:821 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1095:1095 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1099:1104 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1101:1101 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1110:1110 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1114:1119 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1116:1116 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1108:1108 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1115:1121 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1127 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1129 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1133:1133 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1123:1123 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1130:1136 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1134:1142 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1144 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1148:1148 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -18611,19 +18629,19 @@
     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>():918:918 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):918:918 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):942:986 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):991:991 -> a
-    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):995:999 -> a
+    1:1:void <clinit>():933:933 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):933:933 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):957:1001 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1006:1006 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1010:1014 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):999 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1002:1018 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1014 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017:1033 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1018 -> a
-    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1021:1021 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> b
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1033 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036:1036 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -18643,16 +18661,18 @@
     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):847:847 -> <init>
-    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):870:913 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):862:862 -> <init>
+    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):885:928 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
-    com.android.tools.r8.graph.DexMethod initCause -> c
-    com.android.tools.r8.graph.DexMethod getSuppressed -> b
+    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):584:584 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):590:592 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):591:594 -> <init>
-    9:11:void <init>(com.android.tools.r8.graph.DexItemFactory):593:595 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):592:592 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):599:601 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):600:603 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):602:609 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):607:607 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -18673,7 +18693,7 @@
     1:1:java.lang.String toSourceString():92:92 -> g
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
     1:1:java.lang.String toString():87:87 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():87 -> toString
 com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Z0:
     com.android.tools.r8.graph.Descriptor item -> a
@@ -18690,11 +18710,11 @@
 com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.C.Y0:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
 com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.C.a1:
-    com.android.tools.r8.graph.DexProto proto -> e
-    com.android.tools.r8.graph.DexString name -> f
-    com.android.tools.r8.graph.DexType holder -> d
-    boolean $assertionsDisabled -> h
-    java.util.Map singleTargetCache -> g
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.graph.DexProto proto -> f
+    com.android.tools.r8.graph.DexString name -> g
+    com.android.tools.r8.graph.DexType holder -> e
+    java.util.Map singleTargetCache -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):22:28 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):12:12 -> a
@@ -18710,7 +18730,7 @@
     9:9:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
     10:18:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
-    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    20:20:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
     22:22:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
@@ -18720,7 +18740,7 @@
     24:24:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
     25:25:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     25:25:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    26:26:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     26:26:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     27:27:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
     28:28:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
@@ -18736,8 +18756,8 @@
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
     1:1:java.lang.String toSmaliString():166:166 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():117 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toSmaliString():120 -> f
     2:2:java.lang.String toSmaliString():166 -> f
     3:3:java.lang.String toSmaliString():166:166 -> f
     4:4:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> f
@@ -18758,11 +18778,11 @@
     1:1:java.lang.String qualifiedName():161:161 -> s
     1:1:java.lang.String toString():35:35 -> toString
 com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.c1:
-    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> d
-    com.android.tools.r8.graph.Descriptor fieldOrMethod -> e
-    com.android.tools.r8.graph.DexMethod rewrittenTarget -> g
-    boolean isInterface -> f
-    boolean $assertionsDisabled -> h
+    com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.graph.Descriptor fieldOrMethod -> f
+    com.android.tools.r8.graph.DexMethod rewrittenTarget -> h
+    boolean isInterface -> g
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):208:212 -> <init>
     6:10:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean,com.android.tools.r8.graph.DexMethod):219:223 -> <init>
@@ -18807,7 +18827,7 @@
     36:36:boolean isMethodHandle():297:297 -> a
     36:36:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
     37:44:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
-    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     45:45:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
     46:53:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
     54:54:boolean isFieldHandle():293:293 -> a
@@ -18932,7 +18952,7 @@
     boolean isNotProgramClass() -> X
     boolean isProgramClass() -> Y
     1:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:131 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131 -> a
     8:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:133 -> a
     11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
@@ -18960,57 +18980,51 @@
     27:27:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):444:444 -> b
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> c
     4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):276:278 -> c
-    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> c
+    7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339 -> c
-    9:9:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> c
+    8:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
+    9:9:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     10:10:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    10:10:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340 -> c
-    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340:340 -> c
+    10:10:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
+    11:11:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     12:12:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    12:12:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> c
-    13:13:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> c
-    13:13:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    14:14:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    14:14:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349 -> c
-    14:14:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    15:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:350 -> c
-    15:16:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    17:17:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350 -> c
-    17:17:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    18:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350:351 -> c
-    18:19:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    20:20:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    20:20:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> c
-    20:20:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    21:23:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> c
-    21:23:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    24:24:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    24:24:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    25:25:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c
-    25:25:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
-    25:25:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    26:26:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    26:26:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    27:27:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> c
-    27:27:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357 -> c
-    27:27:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    28:28:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    28:28:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    29:29:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    29:29:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
-    29:29:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    30:33:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
-    30:33:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    34:35:void setInitialClassFileVersion(int):388:389 -> c
-    1:3:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
-    4:6:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
-    7:7:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> d
+    12:12:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
+    13:16:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
+    17:18:void setInitialClassFileVersion(int):388:389 -> c
+    1:1:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> d
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
+    2:2:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339 -> d
+    3:3:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> d
+    4:4:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> d
+    4:4:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340 -> d
+    5:5:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):340:340 -> d
+    6:6:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    6:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> d
+    7:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> d
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
+    8:8:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349 -> d
+    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    9:10:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:350 -> d
+    9:10:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    11:11:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> d
+    11:11:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350 -> d
+    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    12:13:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):350:351 -> d
+    12:13:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    14:14:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    14:14:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> d
+    14:14:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    15:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> d
+    15:17:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    18:18:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> d
+    19:21:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
+    22:24:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
     1:12:void computeStaticValues():291:302 -> d0
     13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> d0
     13:13:void computeStaticValues():302 -> d0
     14:16:void computeStaticValues():308:310 -> d0
+    1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
     1:2:int getInitialClassFileVersion():397:398 -> e0
     1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> f0
     1:1:java.lang.String toSourceString():214:214 -> g
@@ -19028,7 +19042,7 @@
     1:1:boolean originatesFromDexResource():116:116 -> o0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
     1:1:java.lang.String toString():209:209 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():209 -> toString
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.d1:
     java.util.Iterator iterator -> b
@@ -19041,21 +19055,21 @@
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
 com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.f1:
-    com.android.tools.r8.graph.DexProto SENTINEL -> g
-    com.android.tools.r8.graph.DexTypeList parameters -> f
-    com.android.tools.r8.graph.DexString shorty -> d
-    com.android.tools.r8.graph.DexType returnType -> e
+    com.android.tools.r8.graph.DexProto SENTINEL -> h
+    com.android.tools.r8.graph.DexString shorty -> e
+    com.android.tools.r8.graph.DexTypeList parameters -> g
+    com.android.tools.r8.graph.DexType returnType -> f
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):17:20 -> <init>
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9:9 -> a
     2:2:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:86 -> a
     2:2:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     3:3:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     3:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     4:4:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):88:88 -> a
     4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     5:5:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     5:5:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     6:6:int slowCompareTo(java.lang.Object):9:9 -> a
@@ -19095,10 +19109,10 @@
     boolean isDexMethod() -> p
     boolean isDexType() -> q
 com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.i1:
-    com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> f
-    boolean $assertionsDisabled -> g
-    int size -> d
-    byte[] content -> e
+    com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
+    boolean $assertionsDisabled -> h
+    int size -> e
+    byte[] content -> f
     1:3:void <clinit>():17:19 -> <clinit>
     1:3:void <init>(int,byte[]):25:27 -> <init>
     4:6:void <init>(java.lang.String):30:32 -> <init>
@@ -19156,86 +19170,86 @@
     25:25:char nextChar():43:43 -> a
     1:1:boolean hasNext():70:70 -> hasNext
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.C.j1:
-    com.android.tools.r8.graph.DexString descriptor -> d
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> f
-    java.lang.String toStringCache -> e
-    1:2:void <clinit>():27:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):33:33 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):31:35 -> <init>
-    1:10:boolean isD8R8SynthesizedClassType():252:261 -> A
-    1:1:boolean isDoubleType():221:221 -> B
-    1:1:boolean isLongType():217:217 -> C
-    1:4:boolean isPrimitiveArrayType():241:244 -> D
-    1:1:boolean isPrimitiveType():180:180 -> E
-    1:2:boolean isReferenceType():235:236 -> F
-    1:1:boolean isVoidType():189:189 -> G
-    1:1:java.lang.String toDescriptorString():86:86 -> H
-    1:1:char toShorty():111:111 -> I
+    java.lang.String toStringCache -> f
+    com.android.tools.r8.graph.DexString descriptor -> e
+    com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> g
+    boolean $assertionsDisabled -> h
+    1:2:void <clinit>():30:31 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):36:36 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexString):34:38 -> <init>
+    1:13:boolean isD8R8SynthesizedClassType():255:267 -> A
+    1:1:boolean isDoubleType():224:224 -> B
+    1:1:boolean isLongType():220:220 -> C
+    1:4:boolean isPrimitiveArrayType():244:247 -> D
+    1:1:boolean isPrimitiveType():183:183 -> E
+    1:2:boolean isReferenceType():238:239 -> F
+    1:1:boolean isVoidType():192:192 -> G
+    1:1:java.lang.String toDescriptorString():89:89 -> H
+    1:1:char toShorty():114:114 -> I
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27:27 -> a
-    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):174:175 -> a
-    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30:30 -> a
+    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):177:178 -> a
+    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
     4:4:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
-    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):176 -> a
-    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
-    5:5:int slowCompareTo(java.lang.Object):27:27 -> a
-    6:7:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):57:58 -> a
-    8:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):72:76 -> a
-    13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):128:129 -> a
+    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):179 -> a
+    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
+    5:5:int slowCompareTo(java.lang.Object):30:30 -> a
+    6:7:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):60:61 -> a
+    8:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):75:79 -> a
+    13:14:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:132 -> a
     15:15:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):129 -> a
-    16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):142:142 -> a
-    17:26:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):313:322 -> a
-    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):326:328 -> a
-    30:32:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):327:329 -> a
-    33:33:java.lang.String getPackageOrName(boolean):333:333 -> a
-    34:34:java.lang.String toDescriptorString():86:86 -> a
-    34:34:java.lang.String getPackageOrName(boolean):334 -> a
-    35:40:java.lang.String getPackageOrName(boolean):335:340 -> a
-    41:41:java.lang.String getPackageDescriptor():345:345 -> a
-    41:41:boolean isSamePackage(com.android.tools.r8.graph.DexType):82 -> a
-    42:42:java.lang.String getPackageDescriptor():345:345 -> a
-    42:42:boolean isSamePackage(com.android.tools.r8.graph.DexType):82 -> a
-    43:43:boolean isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    1:2:boolean computeEquals(java.lang.Object):45:46 -> b
-    3:3:int slowCompareTo(com.android.tools.r8.graph.DexType):162:162 -> b
-    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):303:308 -> b
-    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):307:309 -> b
-    1:1:int compareTo(java.lang.Object):27:27 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexType):157:157 -> compareTo
-    2:2:int compareTo(java.lang.Object):27 -> compareTo
-    1:1:java.lang.String toDescriptorString():86:86 -> f
-    1:1:java.lang.String toSmaliString():117 -> f
-    1:4:java.lang.String toSourceString():99:102 -> g
-    5:5:java.lang.String toDescriptorString():86:86 -> g
-    5:5:java.lang.String toSourceString():104 -> g
+    15:15:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):132 -> a
+    16:16:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
+    17:26:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):319:328 -> a
+    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):332:334 -> a
+    30:32:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):333:335 -> a
+    33:33:java.lang.String getPackageOrName(boolean):339:339 -> a
+    34:34:java.lang.String toDescriptorString():89:89 -> a
+    34:34:java.lang.String getPackageOrName(boolean):340 -> a
+    35:40:java.lang.String getPackageOrName(boolean):341:346 -> a
+    41:41:java.lang.String getPackageDescriptor():351:351 -> a
+    41:41:boolean isSamePackage(com.android.tools.r8.graph.DexType):85 -> a
+    42:42:java.lang.String getPackageDescriptor():351:351 -> a
+    42:42:boolean isSamePackage(com.android.tools.r8.graph.DexType):85 -> a
+    43:43:boolean isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    1:2:boolean computeEquals(java.lang.Object):48:49 -> b
+    3:3:int slowCompareTo(com.android.tools.r8.graph.DexType):165:165 -> b
+    4:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):309:314 -> b
+    10:12:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):313:315 -> b
+    1:1:int compareTo(java.lang.Object):30:30 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexType):160:160 -> compareTo
+    2:2:int compareTo(java.lang.Object):30 -> compareTo
+    1:1:java.lang.String toDescriptorString():89:89 -> f
+    1:1:java.lang.String toSmaliString():120 -> f
+    1:4:java.lang.String toSourceString():102:105 -> g
+    5:5:java.lang.String toDescriptorString():89:89 -> g
+    5:5:java.lang.String toSourceString():107 -> g
     6:6:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> g
-    6:6:java.lang.String toSourceString():104 -> g
-    7:10:java.lang.String toSourceString():104:107 -> g
-    1:1:int computeHashCode():40:40 -> h
+    6:6:java.lang.String toSourceString():107 -> g
+    7:10:java.lang.String toSourceString():107:110 -> g
+    1:1:int computeHashCode():43:43 -> h
     com.android.tools.r8.graph.DexType asDexType() -> n
     boolean isDexType() -> q
-    1:16:int elementSizeForPrimitiveArrayType():275:290 -> r
-    1:1:java.lang.String getInternalName():357:357 -> s
-    2:2:java.lang.String toDescriptorString():86:86 -> s
-    2:2:java.lang.String getInternalName():358 -> s
-    3:3:java.lang.String getInternalName():358:358 -> s
-    1:4:java.lang.String getName():349:352 -> t
-    1:1:java.lang.String toString():122:122 -> toString
-    1:1:int getNumberOfLeadingSquareBrackets():296:296 -> u
-    1:1:java.lang.String getPackageDescriptor():345:345 -> v
-    1:1:java.lang.String toDescriptorString():86:86 -> w
-    1:1:java.lang.String toBinaryName():90 -> w
-    1:1:java.lang.String getPackageName():362 -> w
-    2:4:java.lang.String toBinaryName():91:93 -> w
-    2:4:java.lang.String getPackageName():362 -> w
-    5:8:java.lang.String toBinaryName():91:94 -> w
-    5:8:java.lang.String getPackageName():362 -> w
-    9:9:java.lang.String getPackageName():362:362 -> w
-    1:1:boolean isArrayType():225:225 -> x
-    1:1:boolean isBooleanType():193:193 -> y
-    1:1:boolean isClassType():230:230 -> z
+    1:16:int elementSizeForPrimitiveArrayType():281:296 -> r
+    1:1:java.lang.String getInternalName():363:363 -> s
+    2:2:java.lang.String toDescriptorString():89:89 -> s
+    2:2:java.lang.String getInternalName():364 -> s
+    3:3:java.lang.String getInternalName():364:364 -> s
+    1:4:java.lang.String getName():355:358 -> t
+    1:1:java.lang.String toString():125:125 -> toString
+    1:1:int getNumberOfLeadingSquareBrackets():302:302 -> u
+    1:1:java.lang.String getPackageDescriptor():351:351 -> v
+    1:1:java.lang.String toDescriptorString():89:89 -> w
+    1:1:java.lang.String toBinaryName():93 -> w
+    1:1:java.lang.String getPackageName():368 -> w
+    2:4:java.lang.String toBinaryName():94:96 -> w
+    2:4:java.lang.String getPackageName():368 -> w
+    5:8:java.lang.String toBinaryName():94:97 -> w
+    5:8:java.lang.String getPackageName():368 -> w
+    9:9:java.lang.String getPackageName():368:368 -> w
+    1:1:boolean isArrayType():228:228 -> x
+    1:1:boolean isBooleanType():196:196 -> y
+    1:1:boolean isClassType():233:233 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.k1:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
@@ -19246,7 +19260,7 @@
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):39:40 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):46:46 -> a
     4:10:int compareTo(com.android.tools.r8.graph.DexTypeList):80:86 -> a
-    11:11:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    11:11:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     11:11:int compareTo(com.android.tools.r8.graph.DexTypeList):86 -> a
     12:12:int compareTo(com.android.tools.r8.graph.DexTypeList):92:92 -> a
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
@@ -19556,9 +19570,9 @@
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1026 -> a
     2:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1059:1062 -> a
-    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> a
+    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> a
     6:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
-    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:985 -> a
+    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:983 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
     1:1:boolean equals(java.lang.Object):1049:1049 -> equals
     java.lang.Object asAsmEncodedObject() -> h
@@ -19714,7 +19728,7 @@
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
     1:2:java.lang.String toString():78:79 -> toString
-    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     3:3:java.lang.String toString():79 -> toString
     4:6:java.lang.String toString():79:81 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.N1:
@@ -19982,8 +19996,8 @@
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
 com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.c2:
-    int sortedIndex -> b
-    boolean $assertionsDisabled -> c
+    int sortedIndex -> c
+    boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>():12:15 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
@@ -20026,10 +20040,10 @@
     1:1:boolean isAnonymous():46:46 -> e
     1:1:boolean isNamed():42:42 -> f
     1:1:java.lang.String toString():108:108 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     2:2:java.lang.String toString():109 -> toString
     3:4:java.lang.String toString():109:110 -> toString
-    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> toString
+    5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     5:5:java.lang.String toString():110 -> toString
     6:7:java.lang.String toString():110:111 -> toString
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.e2:
@@ -20393,7 +20407,7 @@
     5:5:void visitEnd():798 -> c
     6:8:boolean classRequiresCode():788:790 -> c
     6:8:void visitEnd():798 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
     9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
@@ -20441,11 +20455,11 @@
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> p
 com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.r2:
-    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> d
-    com.android.tools.r8.graph.CfCode code -> c
-    com.android.tools.r8.graph.JarApplicationReader application -> b
-    boolean reachabilitySensitive -> e
-    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
+    com.android.tools.r8.graph.JarApplicationReader application -> c
+    com.android.tools.r8.graph.CfCode code -> d
+    boolean reachabilitySensitive -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():83:83 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):92:103 -> <init>
     13:15:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):94:96 -> <init>
@@ -20530,7 +20544,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20566,16 +20580,16 @@
     277:277:void visitInsn(int):544:544 -> a
     278:278:void visitInsn(int):541:541 -> a
     279:279:void visitTypeInsn(int,java.lang.String):665:665 -> a
-    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
@@ -20588,7 +20602,7 @@
     335:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
     336:336:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
     337:343:void visitLdcInsn(java.lang.Object):777:783 -> a
-    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     344:344:void visitLdcInsn(java.lang.Object):783 -> a
     345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
     363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
@@ -20599,13 +20613,13 @@
     371:376:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
     377:381:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
     382:383:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
     385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
     424:424:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):879:879 -> a
     425:428:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):878:881 -> a
     429:432:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):887:890 -> a
-    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     433:433:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):891 -> a
     434:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):892:892 -> a
     435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):888:894 -> a
@@ -20804,7 +20818,7 @@
     9:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createMap(java.util.Collection,java.util.function.Consumer):79:86 -> a
     17:28:com.android.tools.r8.graph.DexProgramClass[] sortClasses(com.android.tools.r8.graph.DexApplication,java.util.Collection):140:151 -> a
     29:31:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):146:148 -> a
-    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     32:32:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):148 -> a
     33:33:java.util.Collection keysOrEmpty(java.util.Map):155:155 -> a
     34:34:java.util.Collection getCallSites():183:183 -> a
@@ -21434,7 +21448,7 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):24:26 -> <init>
     1:9:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):30:38 -> a
-    10:10:boolean com.android.tools.r8.graph.DexType.isIntType():209:209 -> a
+    10:10:boolean com.android.tools.r8.graph.DexType.isIntType():212:212 -> a
     10:10:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):38 -> a
     11:20:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):42:51 -> a
     21:28:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):59:66 -> a
@@ -21594,7 +21608,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     18:18:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21621,7 +21635,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21847,7 +21861,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):961:961 -> 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):959:959 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -22004,7 +22018,7 @@
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
@@ -22013,7 +22027,7 @@
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
@@ -22040,15 +22054,15 @@
     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):975:975 -> 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):973:973 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):975 -> 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):973 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):975 -> 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):959:959 -> 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):973 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):976:976 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):974:974 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -22075,50 +22089,42 @@
     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
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70 -> a
-    3:3:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():71:72 -> a
-    4:5:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():72 -> a
-    6:6:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    7:11:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):42:46 -> a
-    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    12:12:int getNesting():53 -> a
-    12:12:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    13:15:int getNesting():54:56 -> a
-    13:15:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
-    16:16:int getNesting():56 -> a
-    16:16:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
-    17:17:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48:48 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    18:18:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
-    19:19:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
-    19:19:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
-    20:31: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
-    32:33:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
-    34:38:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):85:89 -> a
-    39:39:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
-    40:44:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
-    40:44:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
-    45:55: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
-    56: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):173:185 -> a
-    69:71: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
-    69:71: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
-    72:72:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    72:72: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 -> a
-    72:72: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
-    73:73: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):352:352 -> a
-    73:73: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
-    74:74: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:344 -> a
+    3:9:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40:46 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
+    10:10:int getNesting():53 -> a
+    10:10:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    11:13:int getNesting():54:56 -> a
+    11:13:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsMemberType():62:62 -> a
+    14:14:int getNesting():56 -> a
+    14:14:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48 -> a
+    15:15:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):48:48 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement,com.android.tools.r8.graph.AppView):146 -> a
+    18:29: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
+    30:31:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
+    32:36:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):85:89 -> a
+    37:37:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
+    38:42:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
+    38:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
+    43:53: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
+    54: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):173:185 -> a
+    67:69: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
+    67:69: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
+    70:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    70:70: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 -> a
+    70:70: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
+    71:71: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):352:352 -> a
+    71:71: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
+    72:72: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:344 -> a
+    72:72: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
+    73:73:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    73:73: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 -> a
+    73:73: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
+    74:74: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):345:345 -> a
     74:74: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
-    75:75:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    75:75: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 -> a
-    75:75: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
-    76:76: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):345:345 -> a
-    76:76: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:4:boolean equals(java.lang.Object):117:120 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement.nullability():69:69 -> equals
@@ -22234,14 +22240,26 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):221:223 -> <init>
 com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.s.i:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):30:31 -> <init>
-    1:22:void recomputeTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):39:60 -> a
-    23:33:boolean verifyAllPhiOperandsAreBottom(java.util.Set):66:76 -> a
-    34:34:boolean verifyAllPhiOperandsAreBottom(java.util.Set):72:72 -> a
-    1:8:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):85:92 -> b
+    boolean $assertionsDisabled -> c
+    java.util.function.Function mapping -> b
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):31:33 -> <init>
+    1:11:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):40:50 -> a
+    12:18:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):94:100 -> a
+    12:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
+    20:30:boolean verifyAllPhiOperandsAreBottom(java.util.Set):76:86 -> a
+    20:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    31:31:boolean verifyAllPhiOperandsAreBottom(java.util.Set):82:82 -> a
+    31:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    32:44:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:67 -> a
+    45:45:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    45:45:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67 -> a
+    46:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67:71 -> a
+    51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71 -> a
+    52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71:71 -> a
 com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.s.j:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
@@ -22345,7 +22363,7 @@
     1:1:int hashCode():42:42 -> hashCode
     boolean isNullType() -> p
     1:1:java.lang.String toString():37:37 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
 com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.s.s:
@@ -22377,36 +22395,37 @@
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> b
     boolean mayHaveImpreciseTypes -> a
     1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):48:48 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):38:50 -> <init>
-    1:2:void analyze():54:55 -> a
-    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):131:136 -> a
-    3:8:void analyze():55 -> a
-    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):60:63 -> a
-    13:15:void narrowing(java.lang.Iterable):73:75 -> a
-    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):79:82 -> a
-    20:22:void enqueue(com.android.tools.r8.ir.code.Value):86:88 -> a
-    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):94:109 -> a
-    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):49:49 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):39:51 -> <init>
+    1:2:void analyze():55:56 -> a
+    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):137:142 -> a
+    3:8:void analyze():56 -> a
+    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):61:64 -> a
+    13:15:void narrowing(java.lang.Iterable):74:76 -> a
+    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):85:88 -> a
+    20:22:void enqueue(com.android.tools.r8.ir.code.Value):92:94 -> a
+    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):100:115 -> a
+    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    39:39:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):106 -> a
-    39:39:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    40:41:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):112:113 -> a
-    40:41:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
+    39:39:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):112 -> a
+    39:39:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    40:41:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):118:119 -> a
+    40:41:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
     42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    42:42:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):113 -> a
-    42:42:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    43:53:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):116:126 -> a
-    43:53:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    54:81:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:167 -> a
-    82:113:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):173:204 -> a
-    1:1:void widening(java.lang.Iterable):67:67 -> b
-    2:2:boolean lambda$getRefinedReceiverType$1(com.android.tools.r8.ir.code.Value):179:179 -> b
+    42:42:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):119 -> a
+    42:42:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    43:53:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):122:132 -> a
+    43:53:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    54:83:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):146:175 -> a
+    84:96:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):181:193 -> a
+    1:1:boolean verifyValuesUpToDate(java.lang.Iterable):80:80 -> b
+    1:1:void widening(java.lang.Iterable):68:68 -> c
 com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.s.v:
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
-    1:4:void <clinit>():30:33 -> <clinit>
+    1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
 com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.s.x:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
@@ -22516,8 +22535,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22536,7 +22555,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22546,9 +22565,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():56:56 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22560,9 +22579,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> u2
-    1:1:int maxOutValueRegister():59:59 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():54:54 -> v2
+    1:1:int maxOutValueRegister():59:59 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22577,14 +22596,14 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
-    int opcode() -> w2
+    1:2:int maxInValueRegister():54:55 -> v2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> F2
-    boolean isAnd() -> P0
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -22597,14 +22616,14 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,boolean):27:29 -> <init>
     boolean hasInvariantOutType() -> I0
-    boolean isArgument() -> Q0
+    boolean isArgument() -> R0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -22618,15 +22637,15 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():52:52 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> F2
-    boolean isArithmeticBinop() -> R0
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
     26:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
@@ -22651,12 +22670,13 @@
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():33:33 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():264:264 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayGet() -> S0
+    boolean isArrayGet() -> T0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():53:53 -> a
@@ -22722,17 +22742,17 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayLength() -> T0
+    boolean isArrayLength() -> U0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
@@ -22755,23 +22775,23 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> B2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayPut() -> U0
+    boolean isArrayPut() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():71:71 -> a
@@ -22813,24 +22833,23 @@
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():125:125 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():125:125 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Assume$Assumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):30:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> A2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> B2
-    boolean isIntroducingAnAlias() -> C1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> B2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    boolean isIntroducingAnAlias() -> D1
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isAssume() -> V0
-    1:1:boolean isAssumeDynamicType():132:132 -> W0
-    1:1:boolean isAssumeNonNull():145:145 -> X0
+    boolean isAssume() -> W0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Assume createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):55:55 -> a
@@ -22868,7 +22887,7 @@
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
     3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66 -> c
     4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
-    boolean isOutConstant() -> d2
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
     2:2:boolean isAssumeDynamicType():132:132 -> j
@@ -22893,10 +22912,10 @@
     10:10:java.lang.String toString():300 -> toString
     11:17:java.lang.String toString():300:306 -> toString
     18:18:java.lang.String toString():297:297 -> toString
-    1:1:int maxInValueRegister():209:209 -> u2
-    1:1:int maxOutValueRegister():214:214 -> v2
+    1:1:int maxInValueRegister():209:209 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():214:214 -> w2
+    int opcode() -> x2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -22965,369 +22984,382 @@
     java.util.List phis -> h
     java.util.Map incompletePhis -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:124:void <init>():53:176 -> <init>
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():221:222 -> A
-    1:2:boolean hasCatchHandlers():535:536 -> B
-    1:1:boolean hasIncompletePhis():1061:1061 -> C
-    1:1:boolean hasOneNormalExit():1447:1447 -> D
-    1:1:boolean hasPhis():519:519 -> E
-    1:1:boolean hasUniquePredecessor():217:217 -> F
-    1:2:void incrementUnfilledPredecessorCount():625:626 -> G
-    1:1:boolean isEmpty():570:570 -> H
-    1:1:boolean isFilled():527:527 -> I
-    1:1:boolean isSealed():1049:1049 -> J
-    1:11:boolean isSimpleAlwaysThrowingPath():1424:1434 -> K
-    1:1:boolean isTrivialGoto():1379:1379 -> L
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1523:1523 -> M
-    1:1:int numberOfCatchHandlers():1472:1472 -> N
-    1:1:java.util.LinkedList getInstructions():562:562 -> O
-    1:1:int numberOfThrowingInstructions():1477 -> O
-    2:3:int numberOfThrowingInstructions():1477:1478 -> O
-    1:2:void removeAllNormalSuccessors():282:283 -> P
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:124:void <init>():54:177 -> <init>
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():222:223 -> A
+    1:2:boolean hasCatchHandlers():536:537 -> B
+    1:1:boolean hasIncompletePhis():1096:1096 -> C
+    1:1:boolean hasOneNormalExit():1482:1482 -> D
+    1:1:boolean hasPhis():520:520 -> E
+    1:1:boolean hasUniquePredecessor():218:218 -> F
+    1:2:void incrementUnfilledPredecessorCount():660:661 -> G
+    1:1:boolean isEmpty():605:605 -> H
+    1:1:boolean isFilled():528:528 -> I
+    1:1:boolean isSealed():1084:1084 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1459:1469 -> K
+    1:1:boolean isTrivialGoto():1414:1414 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1558:1558 -> M
+    1:1:int numberOfCatchHandlers():1507:1507 -> N
+    1:1:java.util.LinkedList getInstructions():563:563 -> O
+    1:1:int numberOfThrowingInstructions():1512 -> O
+    2:3:int numberOfThrowingInstructions():1512:1513 -> O
+    1:2:void removeAllNormalSuccessors():283:284 -> P
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> P
-    3:3:void removeAllNormalSuccessors():283 -> P
-    4:12:void removeAllNormalSuccessors():284:292 -> P
-    1:9:java.lang.String toDetailedString():1102:1110 -> Q
-    10:10:boolean isFilled():527:527 -> Q
-    10:10:java.lang.String toDetailedString():1110 -> Q
-    11:12:java.lang.String toDetailedString():1110:1111 -> Q
-    13:13:boolean isSealed():1049:1049 -> Q
-    13:13:java.lang.String toDetailedString():1111 -> Q
-    14:51:java.lang.String toDetailedString():1111:1148 -> Q
-    52:52:int digits(int):1098:1098 -> Q
-    52:52:java.lang.String toDetailedString():1148 -> Q
-    53:88:java.lang.String toDetailedString():1148:1183 -> Q
-    1:3:void unlinkCatchHandler():739:741 -> R
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():700:704 -> S
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():710:714 -> T
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():723:728 -> U
-    1:2:boolean verifyFilledPredecessors():640:641 -> V
-    1:2:boolean notifyPredecessorsMayChangeListeners():235:236 -> W
-    1:2:boolean notifySuccessorsMayChangeListeners():196:197 -> X
-    1:1:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):84:84 -> a
-    2:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> a
-    3:3:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):89:89 -> a
-    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):179:183 -> a
-    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):258:266 -> a
-    18:18:java.util.List getPhis():523:523 -> a
-    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):267 -> a
-    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):267:275 -> a
+    3:3:void removeAllNormalSuccessors():284 -> P
+    4:12:void removeAllNormalSuccessors():285:293 -> P
+    1:9:java.lang.String toDetailedString():1137:1145 -> Q
+    10:10:boolean isFilled():528:528 -> Q
+    10:10:java.lang.String toDetailedString():1145 -> Q
+    11:12:java.lang.String toDetailedString():1145:1146 -> Q
+    13:13:boolean isSealed():1084:1084 -> Q
+    13:13:java.lang.String toDetailedString():1146 -> Q
+    14:51:java.lang.String toDetailedString():1146:1183 -> Q
+    52:52:int digits(int):1133:1133 -> Q
+    52:52:java.lang.String toDetailedString():1183 -> Q
+    53:88:java.lang.String toDetailedString():1183:1218 -> Q
+    1:3:void unlinkCatchHandler():774:776 -> R
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():735:739 -> S
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():745:749 -> T
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():758:763 -> U
+    1:2:boolean verifyFilledPredecessors():675:676 -> V
+    1:2:boolean notifyPredecessorsMayChangeListeners():236:237 -> W
+    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> X
+    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
+    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):180:184 -> a
+    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):259:267 -> a
+    18:18:java.util.List getPhis():524:524 -> a
+    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):268 -> a
+    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):268:276 -> a
     28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
-    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):276 -> a
-    29:46:void swapSuccessorsByIndex(int,int):305:322 -> a
-    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):437:444 -> a
-    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):448:451 -> a
+    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):277 -> a
+    29:46:void swapSuccessorsByIndex(int,int):306:323 -> a
+    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):438:445 -> a
+    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):449:452 -> a
     59:60:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):33:34 -> a
-    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451 -> a
-    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451:456 -> a
+    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452 -> a
+    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452:457 -> a
     67:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456 -> a
-    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:474 -> a
+    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457 -> a
+    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457:475 -> a
     87:87:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476 -> a
-    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476:492 -> a
-    105:105:java.util.LinkedList getInstructions():562:562 -> a
-    105:105:boolean consistentBlockInstructions(boolean,boolean):64 -> a
-    106:112:boolean consistentBlockInstructions(boolean,boolean):64:70 -> a
-    113:113:java.util.List getPredecessors():226:226 -> a
-    113:113:boolean consistentBlockInstructions(boolean,boolean):71 -> a
-    114:116:boolean consistentBlockInstructions(boolean,boolean):71:73 -> a
-    117:121:boolean consistentBlockInstructions(boolean,boolean):72:76 -> a
-    122:122:java.util.LinkedList getInstructions():562:562 -> a
-    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97 -> a
-    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:98 -> a
+    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477 -> a
+    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477:493 -> a
+    105:105:java.util.LinkedList getInstructions():563:563 -> a
+    105:105:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    106:112:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    113:113:java.util.List getPredecessors():227:227 -> a
+    113:113:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    114:116:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    117:121:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    122:122:java.util.LinkedList getInstructions():563:563 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
     125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
-    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):566:566 -> a
-    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):601:602 -> a
-    130:132:void clearMark(int):614:616 -> a
-    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):646:646 -> a
-    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:660 -> a
-    135:135:boolean isFilled():527:527 -> a
-    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660 -> a
-    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:663 -> a
-    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:667 -> a
-    141:141:boolean isFilled():527:527 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):667 -> a
-    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:671 -> a
+    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):567:567 -> a
+    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):636:637 -> a
+    130:132:void clearMark(int):649:651 -> a
+    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):681:681 -> a
+    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:695 -> a
+    135:135:boolean isFilled():528:528 -> a
+    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695 -> a
+    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:698 -> a
+    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:702 -> a
+    141:141:boolean isFilled():528:528 -> a
+    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):702 -> a
+    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:706 -> a
     147:147:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
-    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):671 -> a
-    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):672:672 -> a
-    149:150:boolean verifyNoValuesAfterThrowingInstruction():1509:1510 -> a
-    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> a
-    151:151:boolean verifyNoValuesAfterThrowingInstruction():1510 -> a
-    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    152:157:boolean verifyNoValuesAfterThrowingInstruction():1511:1516 -> a
-    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
+    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):706 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):707:707 -> a
+    149:150:boolean verifyNoValuesAfterThrowingInstruction():1544:1545 -> a
+    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> a
+    151:151:boolean verifyNoValuesAfterThrowingInstruction():1545 -> a
+    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    152:157:boolean verifyNoValuesAfterThrowingInstruction():1546:1551 -> a
+    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
     158:158:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    158:158:boolean verifyNoValuesAfterThrowingInstruction():1516 -> a
-    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    159:159:boolean verifyNoValuesAfterThrowingInstruction():1516:1516 -> a
-    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):673:673 -> a
-    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1008:1019 -> a
-    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):674 -> a
-    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):754:754 -> a
-    174:178:boolean isCatchHandlerForSingleGuard():780:784 -> a
-    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):755 -> a
-    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):757:761 -> a
-    184:184:boolean lambda$removeCatchHandlerWithGuard$5(int,com.android.tools.r8.ir.code.BasicBlock):772:772 -> a
-    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):801:810 -> a
-    195:204:void linkCatchSuccessors(java.util.List,java.util.List):849:858 -> a
-    205:208:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):862:865 -> a
-    209:219:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):875:885 -> a
-    220:221:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> a
-    220:221:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):948 -> a
-    222:224:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):950:952 -> a
-    225:243:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):973:991 -> a
-    244:248:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):998:1002 -> a
-    249:252:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1001:1004 -> a
-    253:254:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1024:1025 -> a
-    255:259:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1053:1057 -> a
-    260:267:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1070:1077 -> a
-    268:271:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1187:1190 -> a
-    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1195:1227 -> a
-    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1231:1232 -> a
-    307:319:void removeInstructions(java.util.List):1253:1265 -> a
-    320:320:void setInstructions(java.util.LinkedList):1245:1245 -> a
-    320:320:void removeInstructions(java.util.List):1266 -> a
-    321:322: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):1290:1291 -> a
-    323:327:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1304:1308 -> a
-    328:334: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[]):1339:1345 -> a
-    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1361:1361 -> a
+    158:158:boolean verifyNoValuesAfterThrowingInstruction():1551 -> a
+    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    159:159:boolean verifyNoValuesAfterThrowingInstruction():1551:1551 -> a
+    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):708:708 -> a
+    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1043:1054 -> a
+    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):789:789 -> a
+    174:178:boolean isCatchHandlerForSingleGuard():815:819 -> a
+    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):790 -> a
+    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):792:796 -> a
+    184:184:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):807:807 -> a
+    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):836:845 -> a
+    195:204:void linkCatchSuccessors(java.util.List,java.util.List):884:893 -> a
+    205:208:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):897:900 -> a
+    209:219:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):910:920 -> a
+    220:221:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> a
+    220:221:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):983 -> a
+    222:224:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):985:987 -> a
+    225:243:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1008:1026 -> a
+    244:248:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1033:1037 -> a
+    249:252:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1036:1039 -> a
+    253:254:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1059:1060 -> a
+    255:259:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1088:1092 -> a
+    260:267:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1105:1112 -> a
+    268:271:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1222:1225 -> a
+    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1230:1262 -> a
+    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1266:1267 -> a
+    307:319:void removeInstructions(java.util.List):1288:1300 -> a
+    320:320:void setInstructions(java.util.LinkedList):1280:1280 -> a
+    320:320:void removeInstructions(java.util.List):1301 -> a
+    321:322: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):1325:1326 -> a
+    323:327:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1339:1343 -> a
+    328:334: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[]):1374:1380 -> a
+    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1396:1396 -> a
     336:336:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    336:336:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1361 -> a
-    337:345:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1362:1370 -> a
-    346:346:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    346:346:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1371 -> a
-    347:347:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    347:347:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1372 -> a
-    348:349: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):1373:1374 -> a
-    350:351:boolean canThrow():1486:1487 -> a
-    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535:1535 -> a
-    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    355:355:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1543:1543 -> a
-    356:356:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1554:1554 -> a
-    357:362:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1572:1577 -> a
-    363:363:java.util.List getSuccessors():187:187 -> a
-    363:363:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1578 -> a
-    364:369:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1578:1583 -> a
-    370:375:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1604:1609 -> a
-    370:375:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1587 -> a
-    376:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1591:1595 -> a
-    381:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1620:1636 -> a
-    398:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1664 -> a
-    398:407: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):1636 -> a
+    336:336:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1396 -> a
+    337:345:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1397:1405 -> a
+    346:346:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    346:346:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1406 -> a
+    347:347:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    347:347:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1407 -> a
+    348:349: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):1408:1409 -> a
+    350:351:boolean canThrow():1521:1522 -> a
+    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    355:355:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1578:1578 -> a
+    356:356:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1589:1589 -> a
+    357:362:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1607:1612 -> a
+    363:363:java.util.List getSuccessors():188:188 -> a
+    363:363:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1613 -> a
+    364:369:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1613:1618 -> a
+    370:375:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1639:1644 -> a
+    370:375:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1622 -> a
+    376:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1626:1630 -> a
+    381:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1655:1671 -> a
+    398:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1699 -> a
+    398:407: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):1671 -> a
     408:408:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    408:408:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1665 -> a
-    408:408: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):1636 -> a
-    409:411:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1665:1667 -> a
-    409:411: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):1636 -> a
-    412:412:java.util.LinkedList getInstructions():562:562 -> a
-    412:412:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1668 -> a
-    412:412: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):1636 -> a
-    413:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1668:1685 -> a
-    413:430:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1686 -> a
-    431:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    432:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1687:1690 -> a
-    432:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    436:436:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1691 -> a
-    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    437:442:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1692:1697 -> a
-    437:442:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
-    443:443:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1675 -> a
-    443:443: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):1636 -> a
+    408:408:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1700 -> a
+    408:408: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):1671 -> a
+    409:411:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1700:1702 -> a
+    409:411: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):1671 -> a
+    412:412:java.util.LinkedList getInstructions():563:563 -> a
+    412:412:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1703 -> a
+    412:412: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):1671 -> a
+    413:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1703:1720 -> a
+    413:430:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1721 -> a
+    431:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    432:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1722:1725 -> a
+    432:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    436:436:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726 -> a
+    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    437:442:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1727:1732 -> a
+    437:442:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
+    443:443:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1710 -> a
+    443:443: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):1671 -> a
     444:444:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    444:444:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675 -> a
-    444:444: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):1636 -> a
-    445:479:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1709 -> a
-    445:479:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
+    444:444:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710 -> a
+    444:444: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):1671 -> a
+    445:479:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1744 -> a
+    445:479:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
     480:480:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
-    480:480:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1711 -> a
-    480:480:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1636 -> a
+    480:480:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    480:480:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1671 -> a
     481:481:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    481:481:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1712 -> a
-    481:481: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):1636 -> a
-    482:482:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1712:1712 -> a
-    482:482: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):1636 -> a
-    483:483:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1655 -> a
-    483:483: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):1636 -> a
-    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):236:236 -> b
-    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):327:355 -> b
-    31:31:java.util.LinkedList getInstructions():562:562 -> b
-    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):357 -> b
-    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):357:357 -> b
+    481:481:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1747 -> a
+    481:481: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):1671 -> a
+    482:482:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1747:1747 -> a
+    482:482: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):1671 -> a
+    483:483:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1690 -> a
+    483:483: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):1671 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):237:237 -> b
+    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):328:356 -> b
+    31:31:java.util.LinkedList getInstructions():563:563 -> b
+    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):358 -> b
+    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):358:358 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359:359 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:360 -> b
     35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
-    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:363 -> b
-    40:40:java.util.List getPredecessors():226:226 -> b
-    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):424 -> b
-    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):424:424 -> b
-    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    42:42:java.util.List getPredecessors():226:226 -> b
-    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427 -> b
-    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427:428 -> b
-    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363:368 -> b
-    51:51:java.util.LinkedList getInstructions():562:562 -> b
-    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369 -> b
-    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369:378 -> b
-    62:62:java.util.LinkedList getInstructions():562:562 -> b
-    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):379 -> b
-    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):379:415 -> b
-    100:101:void removePhisByIndex(java.util.List):513:514 -> b
-    102:103:void decrementUnfilledPredecessorCount(int):630:631 -> b
-    104:105:void removePhi(com.android.tools.r8.ir.code.Phi):650:651 -> b
-    106:115:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):766:775 -> b
-    116:117:java.util.Set cleanForRemoval():815:816 -> b
-    118:118:java.util.List getPhis():523:523 -> b
-    118:118:java.util.Set cleanForRemoval():817 -> b
-    119:126:java.util.Set cleanForRemoval():817:824 -> b
-    127:127:java.util.List getPhis():523:523 -> b
-    127:127:java.util.Set cleanForRemoval():825 -> b
-    128:131:java.util.Set cleanForRemoval():825:828 -> b
-    132:132:java.util.List getPhis():523:523 -> b
-    132:132:java.util.Set cleanForRemoval():831 -> b
-    133:133:java.util.Set cleanForRemoval():831:831 -> b
-    134:134:java.util.LinkedList getInstructions():562:562 -> b
-    134:134:java.util.Set cleanForRemoval():832 -> b
-    135:135:java.util.Set cleanForRemoval():832:832 -> b
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    136:136:java.util.Set cleanForRemoval():833 -> b
-    137:137:java.util.Set cleanForRemoval():834:834 -> b
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    138:138:java.util.Set cleanForRemoval():835 -> b
-    139:146:java.util.Set cleanForRemoval():835:842 -> b
-    147:148:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> b
-    147:148:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):942 -> b
-    149:152:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1029:1032 -> b
-    153:153:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> b
-    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):197:197 -> c
-    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:301 -> c
-    7:8:boolean isMarked(int):620:621 -> c
-    9:9:boolean blocksClean(java.util.List):686:686 -> c
-    10:12:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1274:1276 -> c
-    13:13:void clearCatchHandlers():1463:1463 -> c
-    14:23:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1814:1823 -> c
-    24:24:java.util.List getSuccessors():187:187 -> c
-    24:24:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1824 -> c
-    25:27:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1824:1826 -> c
-    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):679:682 -> d
-    5:5:void clearCurrentDefinitions():921:921 -> d
-    6:6:java.util.List getPhis():523:523 -> d
-    6:6:void clearCurrentDefinitions():922 -> d
-    7:8:void clearCurrentDefinitions():922:923 -> d
-    9:9:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> d
-    10:10:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> d
-    10:10:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):566 -> d
-    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):252:254 -> e
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361:364 -> b
+    40:40:java.util.List getPredecessors():227:227 -> b
+    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):425 -> b
+    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):425:425 -> b
+    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    42:42:java.util.List getPredecessors():227:227 -> b
+    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):428 -> b
+    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):428:429 -> b
+    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364:369 -> b
+    51:51:java.util.LinkedList getInstructions():563:563 -> b
+    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):370 -> b
+    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):370:379 -> b
+    62:62:java.util.LinkedList getInstructions():563:563 -> b
+    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):380 -> b
+    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):380:416 -> b
+    100:101:void removePhisByIndex(java.util.List):514:515 -> b
+    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):571:571 -> b
+    103:104:void decrementUnfilledPredecessorCount(int):665:666 -> b
+    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):685:686 -> b
+    107:116:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):801:810 -> b
+    117:118:java.util.Set cleanForRemoval():850:851 -> b
+    119:119:java.util.List getPhis():524:524 -> b
+    119:119:java.util.Set cleanForRemoval():852 -> b
+    120:127:java.util.Set cleanForRemoval():852:859 -> b
+    128:128:java.util.List getPhis():524:524 -> b
+    128:128:java.util.Set cleanForRemoval():860 -> b
+    129:132:java.util.Set cleanForRemoval():860:863 -> b
+    133:133:java.util.List getPhis():524:524 -> b
+    133:133:java.util.Set cleanForRemoval():866 -> b
+    134:134:java.util.Set cleanForRemoval():866:866 -> b
+    135:135:java.util.LinkedList getInstructions():563:563 -> b
+    135:135:java.util.Set cleanForRemoval():867 -> b
+    136:136:java.util.Set cleanForRemoval():867:867 -> b
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    137:137:java.util.Set cleanForRemoval():868 -> b
+    138:138:java.util.Set cleanForRemoval():869:869 -> b
+    139:139:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    139:139:java.util.Set cleanForRemoval():870 -> b
+    140:147:java.util.Set cleanForRemoval():870:877 -> b
+    148:149:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> b
+    148:149:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):977 -> b
+    150:153:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1064:1067 -> 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):298:302 -> c
+    7:8:boolean isMarked(int):655:656 -> c
+    9:9:boolean blocksClean(java.util.List):721:721 -> c
+    10:10:void clearCatchHandlers():1498:1498 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> c
+    12:21:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1849:1858 -> c
+    22:22:java.util.List getSuccessors():188:188 -> c
+    22:22:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1859 -> c
+    23:25:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1859:1861 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):714:717 -> d
+    5:5:void clearCurrentDefinitions():956:956 -> d
+    6:6:java.util.List getPhis():524:524 -> d
+    6:6:void clearCurrentDefinitions():957 -> d
+    7:8:void clearCurrentDefinitions():957:958 -> d
+    9:11:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1309:1311 -> d
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):253:255 -> e
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> e
-    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254 -> e
-    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254:254 -> e
-    6:7:void clearUserInfo():596:597 -> e
-    8:11:void mark(int):607:610 -> e
-    1:2:int numberInstructions(int):554:555 -> f
-    3:4:boolean consistentCatchHandlers():892:893 -> f
-    5:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> f
-    5:5:boolean consistentCatchHandlers():894 -> f
-    6:7:boolean consistentCatchHandlers():896:897 -> f
-    8:14:boolean consistentCatchHandlers():896:902 -> f
-    15:15:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> f
-    15:15:boolean consistentCatchHandlers():902 -> f
-    16:25:boolean consistentCatchHandlers():902:911 -> f
-    26:26:java.util.List getSuccessors():187:187 -> f
-    26:26:boolean consistentCatchHandlers():912 -> f
-    27:30:boolean consistentCatchHandlers():912:915 -> f
-    31:32:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1467:1468 -> f
-    1:2:void setNumber(int):545:546 -> g
-    3:4:void decrementUnfilledPredecessorCount():635:636 -> g
-    5:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1729:1765 -> g
-    42:42:java.util.List getPredecessors():226:226 -> g
-    42:42:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1765 -> g
-    43:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1765:1766 -> g
-    45:45:java.util.List getPhis():523:523 -> g
-    45:45:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1766 -> g
-    46:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1766:1785 -> g
-    66:66:java.util.List getPredecessors():226:226 -> g
-    66:66:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1785 -> g
-    67:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1785:1789 -> g
-    72:72:java.util.List getPredecessors():226:226 -> g
-    72:72:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1789 -> g
-    73:88:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1789:1804 -> g
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255:255 -> e
+    6:7:void clearUserInfo():631:632 -> e
+    8:11:void mark(int):642:645 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):567 -> e
+    1:2:int numberInstructions(int):555:556 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):572:572 -> f
+    4:5:boolean consistentCatchHandlers():927:928 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> f
+    6:6:boolean consistentCatchHandlers():929 -> f
+    7:8:boolean consistentCatchHandlers():931:932 -> f
+    9:15:boolean consistentCatchHandlers():931:937 -> f
+    16:16:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> f
+    16:16:boolean consistentCatchHandlers():937 -> f
+    17:26:boolean consistentCatchHandlers():937:946 -> f
+    27:27:java.util.List getSuccessors():188:188 -> f
+    27:27:boolean consistentCatchHandlers():947 -> f
+    28:31:boolean consistentCatchHandlers():947:950 -> f
+    32:33:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1502:1503 -> f
+    1:2:void setNumber(int):546:547 -> g
+    3:4:void decrementUnfilledPredecessorCount():670:671 -> g
+    5:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1764:1800 -> g
+    42:42:java.util.List getPredecessors():227:227 -> g
+    42:42:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800 -> g
+    43:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1801 -> g
+    45:45:java.util.List getPhis():524:524 -> g
+    45:45:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1801 -> g
+    46:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1801:1820 -> g
+    66:66:java.util.List getPredecessors():227:227 -> g
+    66:66:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1820 -> g
+    67:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1820:1824 -> g
+    72:72:java.util.List getPredecessors():227:227 -> g
+    72:72:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1824 -> g
+    73:88:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1824:1839 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$4(com.android.tools.r8.ir.code.BasicBlock):688:689 -> h
-    3:17:void deduplicatePhis():1857:1871 -> h
-    java.lang.String lambda$toDetailedString$6(com.android.tools.r8.ir.code.BasicBlock) -> i
-    1:4:void detachAllSuccessors():793:796 -> i
-    5:6:boolean verifyOnThrowWrite(int):1499:1500 -> i
-    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1091:1092 -> j
-    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1036:1044 -> j
-    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092 -> j
-    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092:1092 -> j
-    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1407:1409 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():574:574 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():584:585 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():585 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():586:588 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():578:580 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1451:1455 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> o
-    1:1:java.util.LinkedList getInstructions():562:562 -> p
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():93:93 -> q
-    1:2:java.util.List getMutablePredecessors():230:231 -> r
-    1:2:java.util.List getMutableSuccessors():191:192 -> s
-    1:7:java.util.List getNormalPredecessors():242:248 -> t
-    1:1:java.lang.String toString():1083:1083 -> toString
-    1:11:java.util.List getNormalSuccessors():203:213 -> u
-    1:2:int getNumber():540:541 -> v
-    1:1:java.lang.String getNumberAsString():550:550 -> w
-    1:1:java.util.List getPhis():523:523 -> x
-    1:1:java.util.List getPredecessors():226:226 -> y
-    1:1:java.util.List getSuccessors():187:187 -> z
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
+    3:17:void deduplicatePhis():1892:1906 -> h
+    java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock) -> i
+    1:4:void detachAllSuccessors():828:831 -> i
+    5:6:boolean verifyOnThrowWrite(int):1534:1535 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1126:1127 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1071:1079 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127:1127 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1442:1444 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():609:609 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():619:620 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():620 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():621:623 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():613:615 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1486:1490 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> o
+    1:1:java.util.LinkedList getInstructions():563:563 -> p
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
+    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutableSuccessors():192:193 -> s
+    1:7:java.util.List getNormalPredecessors():243:249 -> t
+    1:1:java.lang.String toString():1118:1118 -> toString
+    1:11:java.util.List getNormalSuccessors():204:214 -> u
+    1:2:int getNumber():541:542 -> v
+    1:1:java.lang.String getNumberAsString():551:551 -> w
+    1:1:java.util.List getPhis():524:524 -> x
+    1:1:java.util.List getPredecessors():227:227 -> y
+    1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.D.b.q:
+    com.android.tools.r8.ir.code.Instruction next -> b
+    com.android.tools.r8.ir.code.Instruction val$instruction -> c
+    com.android.tools.r8.ir.code.BasicBlock this$0 -> d
+    com.android.tools.r8.ir.code.InstructionIterator iterator -> a
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):572:575 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():578:580 -> f
+    1:1:boolean hasNext():589:589 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():594:598 -> next
+    1:5:java.lang.Object next():572 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():596:596 -> next
+    6:6:java.lang.Object next():572 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.D.b.r:
 com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.D.b.s:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
-    1:3:void <clinit>():112:114 -> <clinit>
-    1:1:void <init>(java.lang.String,int):111:111 -> <init>
+    1:3:void <clinit>():113:115 -> <clinit>
+    1:1:void <init>(java.lang.String,int):112:112 -> <init>
 com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.D.b.t:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1834:1834 -> <clinit>
-    1:1:void <init>():1834:1834 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1834:1834 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1834:1834 -> a
-    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1837:1839 -> a
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1834 -> a
-    5:5:int doHash(java.lang.Object):1834:1834 -> a
-    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1849:1849 -> a
-    6:6:int doHash(java.lang.Object):1834 -> a
+    1:1:void <clinit>():1869:1869 -> <clinit>
+    1:1:void <init>():1869:1869 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1869:1869 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1869:1869 -> a
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1872:1874 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1869 -> a
+    5:5:int doHash(java.lang.Object):1869:1869 -> a
+    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1884:1884 -> a
+    6:6:int doHash(java.lang.Object):1869 -> a
     7:7:int com.android.tools.r8.ir.code.Value.hashCode():760:760 -> a
-    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1850 -> a
-    7:7:int doHash(java.lang.Object):1834 -> a
+    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1885 -> a
+    7:7:int doHash(java.lang.Object):1869 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
     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>():103:104 -> <clinit>
-    1:1:void <init>(java.lang.String,int):102:102 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107 -> a
-    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107:107 -> 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():330:330 -> a
+    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.D.b.w:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
@@ -23387,7 +23419,7 @@
     94:94:boolean hasNext():57:57 -> a
     94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
     95:98:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
-    99:99:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    99:99:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     99:99:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
     100:100:boolean hasPrevious():73:73 -> a
     100:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
@@ -23408,7 +23440,7 @@
     175:175:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
     176:177:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
     178:184:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):448:454 -> a
-    185:185:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    185:185:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     185:185:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
     185:185:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
     186:187:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
@@ -23423,7 +23455,7 @@
     220:220:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     220:220:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489 -> a
     221:221:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):491:491 -> a
-    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     222:222:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
     223: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):492:508 -> a
     240:240:void add(java.lang.Object):28:28 -> a
@@ -23438,7 +23470,7 @@
     261:261:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
     261:261:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
     262:269:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
-    270:270:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    270:270:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     270:270:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
     271:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:553 -> a
     285:285:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23447,7 +23479,7 @@
     288:288:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     288:288:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557 -> a
     289:291:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557:559 -> a
-    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    292:292:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     292:292:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
     293:293:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
     294:294:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
@@ -23462,13 +23494,13 @@
     317:317:java.lang.Object next():28:28 -> a
     317:317:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):578 -> a
     318:332:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):579:593 -> a
-    333:333:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):899:899 -> a
+    333:333:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):897:897 -> a
     333:333:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
     334:347:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
     348:364:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
     348: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):610 -> a
     365:370:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
-    371:371:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    371:371:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     371:371:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
     372:382:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
     383:387:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
@@ -23479,7 +23511,7 @@
     414:414:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
     414:414:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
     415:415:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
-    416:416:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    416:416:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     416:416:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
     417:427:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
     428:428:java.lang.Object previous():28:28 -> a
@@ -23549,13 +23581,13 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> A2
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> C2
-    1:2:int maxInOutValueRegisterSize():82:83 -> D2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> E2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> B2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> D2
+    1:2:int maxInOutValueRegisterSize():82:83 -> E2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> F2
     boolean hasInvariantOutType() -> I0
-    boolean isBinop() -> Y0
+    boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
     9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -23573,8 +23605,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> u2
-    1:1:int maxOutValueRegister():95:95 -> v2
+    1:1:int maxInValueRegister():90:90 -> v2
+    1:1:int maxOutValueRegister():95:95 -> w2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23640,13 +23672,12 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> A2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> B2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> B2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> B2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> C2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isCheckCast() -> Z0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
     2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:70 -> a
     16:16:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
@@ -23657,6 +23688,7 @@
     20:21:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):164:165 -> a
     22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):176:176 -> a
     23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):181:181 -> a
+    boolean isCheckCast() -> a1
     1:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):124:128 -> b
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):130 -> b
@@ -23670,15 +23702,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> B2
+    boolean isCommutative() -> C2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23699,13 +23731,13 @@
     124:130:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):213:219 -> a
     131:131:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):234:234 -> a
     132:132:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
-    boolean isCmp() -> a1
+    boolean isCmp() -> b1
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23719,7 +23751,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> A2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23754,13 +23786,13 @@
     53:53:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
-    boolean isConstClass() -> b1
-    boolean isOutConstant() -> d2
+    boolean isConstClass() -> c1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():72:72 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23769,14 +23801,14 @@
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):54 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isConstInstruction() -> c1
+    boolean isConstInstruction() -> d1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
 com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.D.b.J:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23795,19 +23827,19 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23826,51 +23858,51 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> d2
-    boolean isConstMethodType() -> e1
+    boolean isOutConstant() -> e2
+    boolean isConstMethodType() -> f1
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> A2
-    1:1:double getDoubleValue():92:92 -> B2
-    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> B2
-    2:2:double getDoubleValue():92 -> B2
-    3:4:double getDoubleValue():92:93 -> B2
-    1:1:float getFloatValue():87:87 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> B2
+    1:1:double getDoubleValue():92:92 -> C2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> C2
-    2:2:float getFloatValue():87 -> C2
-    3:4:float getFloatValue():87:88 -> C2
-    1:1:int getIntValue():76:76 -> D2
+    2:2:double getDoubleValue():92 -> C2
+    3:4:double getDoubleValue():92:93 -> C2
+    1:1:float getFloatValue():87:87 -> D2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    2:2:int getIntValue():76 -> D2
-    3:3:int getIntValue():76:76 -> D2
-    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    4:4:int getIntValue():77 -> D2
-    5:5:int getIntValue():77:77 -> D2
-    6:8:int getIntValue():76:78 -> D2
-    1:1:long getLongValue():82:82 -> E2
+    2:2:float getFloatValue():87 -> D2
+    3:4:float getFloatValue():87:88 -> D2
+    1:1:int getIntValue():76:76 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2:long getLongValue():82 -> E2
-    3:4:long getLongValue():82:83 -> E2
-    1:1:long getRawValue():97:97 -> F2
-    1:1:boolean is16Bit():273:273 -> G2
-    1:1:boolean is8Bit():265:265 -> H2
-    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> I2
-    1:1:boolean isIntegerOne():109 -> I2
-    2:2:boolean isIntegerOne():109:109 -> I2
+    2:2:int getIntValue():76 -> E2
+    3:3:int getIntValue():76:76 -> E2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
+    4:4:int getIntValue():77 -> E2
+    5:5:int getIntValue():77:77 -> E2
+    6:8:int getIntValue():76:78 -> E2
+    1:1:long getLongValue():82:82 -> F2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    2:2:long getLongValue():82 -> F2
+    3:4:long getLongValue():82:83 -> F2
+    1:1:long getRawValue():97:97 -> G2
+    1:1:boolean is16Bit():273:273 -> H2
+    1:1:boolean is8Bit():265:265 -> I2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> J2
-    1:1:boolean isIntegerZero():105 -> J2
-    2:2:boolean isIntegerZero():105:105 -> J2
-    1:1:boolean isZero():101:101 -> K2
-    1:1:boolean negativeIs16Bit():277:277 -> L2
-    1:1:boolean negativeIs8Bit():269:269 -> M2
+    1:1:boolean isIntegerOne():109 -> J2
+    2:2:boolean isIntegerOne():109:109 -> J2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
+    1:1:boolean isIntegerZero():105 -> K2
+    2:2:boolean isIntegerZero():105:105 -> K2
+    1:1:boolean isZero():101:101 -> L2
+    1:1:boolean negativeIs16Bit():277:277 -> M2
+    1:1:boolean negativeIs8Bit():269:269 -> N2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23953,23 +23985,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> d2
-    boolean isConstNumber() -> f1
+    boolean isOutConstant() -> e2
+    boolean isConstNumber() -> g1
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:2:java.lang.String toString():245:246 -> toString
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     3:3:java.lang.String toString():246 -> toString
     4:6:java.lang.String toString():246:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():234:234 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> A2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -23993,7 +24025,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -24001,13 +24033,13 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isConstString() -> g1
+    boolean isOutConstant() -> e2
+    boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():74:74 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -24027,6 +24059,7 @@
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24036,18 +24069,20 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalRead():96:96 -> 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):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalRead() -> k1
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isDebugLocalRead() -> l1
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    boolean isDebugLocalUninitialized() -> l1
+    boolean isDebugLocalUninitialized() -> m1
 com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.D.b.Q:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:30 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> a
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
@@ -24058,8 +24093,8 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> d2
-    boolean isDebugLocalWrite() -> m1
+    boolean isOutConstant() -> e2
+    boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
     boolean $assertionsDisabled -> j
@@ -24067,9 +24102,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> A2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> a
@@ -24085,17 +24121,18 @@
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):124:124 -> a
     19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalsChange() -> n1
+    boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
-    1:1:int maxInValueRegister():77:77 -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxOutValueRegister():82:82 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():77:77 -> v2
+    1:1:int maxOutValueRegister():82:82 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24105,11 +24142,11 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():104:104 -> 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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugPosition() -> o1
-    1:1:int maxInValueRegister():55:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
+    boolean isDebugPosition() -> p1
+    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24131,8 +24168,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> A2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> B2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24163,17 +24200,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isDexItemBasedConstString() -> p1
+    boolean isOutConstant() -> e2
+    boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():97:97 -> v2
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24192,8 +24229,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isDiv() -> q1
-    int opcode() -> w2
+    boolean isDiv() -> r1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
@@ -24253,19 +24290,19 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> A2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> A2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> A2
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> A2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> A2
-    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> A2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> B2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> B2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> B2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> B2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> B2
-    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> B2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> B2
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> D2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24276,10 +24313,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-    boolean isDup() -> r1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():92:92 -> v2
-    int opcode() -> w2
+    boolean isDup() -> s1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():92:92 -> w2
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Dup asDup() -> z
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.D.b.b0:
     boolean $assertionsDisabled -> h
@@ -24296,10 +24333,10 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):112 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-    boolean isDup2() -> s1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    boolean isDup2() -> t1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -24307,9 +24344,9 @@
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> A2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> B2
-    com.android.tools.r8.ir.code.Value value() -> C2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> B2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
+    com.android.tools.r8.ir.code.Value value() -> D2
     boolean hasInvariantOutType() -> I0
     1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
     25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():124:124 -> a
@@ -24325,7 +24362,7 @@
     7:7:com.android.tools.r8.graph.DexField getField():43:43 -> d
     7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> d
     8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:164 -> d
-    boolean isFieldInstruction() -> u1
+    boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.D.b.e0:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
@@ -24374,7 +24411,8 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> C2
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
@@ -24382,7 +24420,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():895 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24395,14 +24433,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():895:895 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893:893 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():65:65 -> v2
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():65:65 -> w2
+    boolean isGoto() -> x1
+    int opcode() -> x2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24418,64 +24456,69 @@
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):119:119 -> <init>
     2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):99:129 -> <init>
-    1:12:boolean verifyNoImpreciseOrBottomTypes():806:817 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():821:828 -> B
+    1:12:boolean verifyNoImpreciseOrBottomTypes():804:815 -> A
+    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
     1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    1:6:boolean computeAllThrowingInstructionsHavePositions():998:1003 -> D
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():832:843 -> E
+    1:6:boolean computeAllThrowingInstructionsHavePositions():996:1001 -> D
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():830:841 -> E
     1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):265:281 -> a
     18:22:void ensureBlockNumbering():386:390 -> a
     18:22:void print(com.android.tools.r8.utils.CfgPrinter):492 -> a
     23:24:void print(com.android.tools.r8.utils.CfgPrinter):493:494 -> a
     25:25:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):544:544 -> a
     26:26:void lambda$consistentBlockNumbering$1(java.lang.Integer,java.lang.Long):699:699 -> a
-    27:33:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):808:814 -> a
-    34:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):813:813 -> a
-    35:38:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):850:853 -> a
-    39:42:boolean verifySSATypeLattice(java.util.function.Predicate):859:862 -> a
+    27:33:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):806:812 -> a
+    34:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):811:811 -> a
+    35:38:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):848:851 -> a
+    39:42:boolean verifySSATypeLattice(java.util.function.Predicate):857:860 -> a
     43:43:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    43:43:boolean verifySSATypeLattice(java.util.function.Predicate):862 -> a
-    44:48:boolean verifySSATypeLattice(java.util.function.Predicate):862:866 -> a
-    49:50:java.util.List collectArguments(boolean):929:930 -> a
-    49:50:java.util.List collectArguments():925 -> a
-    51:51:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> a
-    51:51:java.util.List collectArguments(boolean):930 -> a
-    51:51:java.util.List collectArguments():925 -> a
-    52:55:java.util.List collectArguments(boolean):931:934 -> a
-    52:55:java.util.List collectArguments():925 -> a
+    43:43:boolean verifySSATypeLattice(java.util.function.Predicate):860 -> a
+    44:48:boolean verifySSATypeLattice(java.util.function.Predicate):860:864 -> a
+    49:50:java.util.List collectArguments(boolean):927:928 -> a
+    49:50:java.util.List collectArguments():923 -> a
+    51:51:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> a
+    51:51:java.util.List collectArguments(boolean):928 -> a
+    51:51:java.util.List collectArguments():923 -> a
+    52:55:java.util.List collectArguments(boolean):929:932 -> a
+    52:55:java.util.List collectArguments():923 -> a
     56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    56:56:java.util.List collectArguments(boolean):934 -> a
-    56:56:java.util.List collectArguments():925 -> a
-    57:62:java.util.List collectArguments(boolean):936:941 -> a
-    57:62:java.util.List collectArguments():925 -> a
-    63:63:java.util.List collectArguments(boolean):940:940 -> a
-    63:63:java.util.List collectArguments():925 -> a
-    64:64:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> a
-    64:64:java.util.List collectArguments(boolean):930 -> a
-    64:64:java.util.List collectArguments():925 -> a
-    65:65:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):957:957 -> a
-    66:66:void setAllThrowingInstructionsHavePositions(boolean):994:994 -> a
-    67:70:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1023:1026 -> a
-    71:72:boolean anyBlocksMarkedWithColor(int):1066:1067 -> a
-    73:73:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1079 -> a
-    74:82:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1104:1112 -> a
-    74:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1080 -> a
-    83:88:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1081:1086 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    89:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1086 -> a
-    90:96:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1087:1093 -> a
-    97:97:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    97:97:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1093 -> a
-    98:98:void markTransitiveSuccessors(java.util.Deque,int):1151:1151 -> a
-    99:99:boolean isMarkingColorInUse(int):1062:1062 -> a
-    99:99:void markTransitiveSuccessors(java.util.Deque,int):1151 -> a
-    100:109:void markTransitiveSuccessors(java.util.Deque,int):1151:1160 -> a
-    110:110:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1172 -> a
-    111:111:boolean isMarkingColorInUse(int):1062:1062 -> a
-    111:111:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172 -> a
-    112:123:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1183 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> a
-    124:124:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1091 -> a
+    56:56:java.util.List collectArguments(boolean):932 -> a
+    56:56:java.util.List collectArguments():923 -> a
+    57:62:java.util.List collectArguments(boolean):934:939 -> a
+    57:62:java.util.List collectArguments():923 -> a
+    63:63:java.util.List collectArguments(boolean):938:938 -> a
+    63:63:java.util.List collectArguments():923 -> a
+    64:64:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> a
+    64:64:java.util.List collectArguments(boolean):928 -> a
+    64:64:java.util.List collectArguments():923 -> a
+    65:65:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):955:955 -> a
+    66:66:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963:963 -> a
+    67:67:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    67:67:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963 -> a
+    68:68:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):964:964 -> a
+    69:69:void setAllThrowingInstructionsHavePositions(boolean):992:992 -> a
+    70:73:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1021:1024 -> a
+    74:74:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1077:1077 -> a
+    75:83:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1102:1110 -> a
+    75:83:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1078 -> a
+    84:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1084 -> a
+    90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1084 -> a
+    91:97:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1085:1091 -> a
+    98:98:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    98:98:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1091 -> a
+    99:99:void markTransitiveSuccessors(java.util.Deque,int):1149:1149 -> a
+    100:100:boolean isMarkingColorInUse(int):1060:1060 -> a
+    100:100:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    101:102:boolean anyBlocksMarkedWithColor(int):1064:1065 -> a
+    101:102:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    103:112:void markTransitiveSuccessors(java.util.Deque,int):1149:1158 -> a
+    113:113:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1170 -> a
+    114:114:boolean isMarkingColorInUse(int):1060:1060 -> a
+    114:114:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170 -> a
+    115:126:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1181 -> a
+    127:127:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> a
+    127:127:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1089 -> a
     1:52:java.util.Map computeLiveAtEntrySets():149:200 -> b
     53:56:java.util.Map computeLiveAtEntrySets():199:202 -> b
     57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
@@ -24491,64 +24534,60 @@
     111:111:java.util.Map computeLiveAtEntrySets():258 -> b
     112:114:java.util.Map computeLiveAtEntrySets():258:260 -> b
     115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):509:519 -> b
-    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:825 -> b
-    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:823 -> b
-    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):847:847 -> b
-    131:131:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965:965 -> b
-    132:132:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    132:132:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965 -> b
-    133:133:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):966:966 -> b
-    134:134:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1191:1191 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:823 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:821 -> b
+    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):845:845 -> b
+    131:131:boolean isMarkingColorInUse(int):1060:1060 -> b
+    132:132:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1189:1189 -> b
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):540:541 -> c
     3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):549:552 -> c
     3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):541 -> c
     7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):542:544 -> c
-    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:839 -> c
-    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:840 -> c
-    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):835:835 -> c
-    24:30:java.util.List computeNormalExitBlocks():885:891 -> c
-    31:31:boolean isMarkingColorInUse(int):1062:1062 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:837 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:838 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):833:833 -> c
+    24:30:java.util.List computeNormalExitBlocks():883:889 -> c
+    31:31:java.util.ListIterator listIterator(int):897:897 -> c
     1:4:boolean consistentBlockNumbering():694:697 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):838:838 -> d
-    6:6:java.util.ListIterator listIterator(int):899:899 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():980:980 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():980 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():981:981 -> e
-    4:4:void returnMarkingColor(int):1056:1056 -> e
-    5:5:boolean isMarkingColorInUse(int):1062:1062 -> e
-    5:5:void returnMarkingColor(int):1056 -> e
-    6:6:void returnMarkingColor(int):1056:1056 -> e
-    7:8:void clearMarks(int):407:408 -> e
-    7:8:void returnMarkingColor(int):1057 -> e
-    9:9:void returnMarkingColor(int):1058:1058 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():990:990 -> f
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):836:836 -> d
+    6:6:void returnMarkingColor(int):1054:1054 -> d
+    7:7:boolean isMarkingColorInUse(int):1060:1060 -> d
+    7:7:void returnMarkingColor(int):1054 -> d
+    8:8:void returnMarkingColor(int):1054:1054 -> d
+    9:10:void clearMarks(int):407:408 -> d
+    9:10:void returnMarkingColor(int):1055 -> d
+    11:11:void returnMarkingColor(int):1056:1056 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():978:978 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():978 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():979:979 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():988:988 -> f
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191:1191 -> h
-    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> h
-    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191 -> h
-    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191:1204 -> h
-    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> h
-    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191 -> h
-    1:1:int getHighestBlockNumber():970:970 -> i
-    1:1:int getNextInstructionNumber():921:921 -> j
-    1:4:com.android.tools.r8.ir.code.Value getThis():946:949 -> k
-    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> k
-    5:5:com.android.tools.r8.ir.code.Value getThis():949 -> k
-    6:8:com.android.tools.r8.ir.code.Value getThis():949:951 -> k
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189:1189 -> h
+    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189:1202 -> h
+    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> h
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189 -> h
+    1:1:int getHighestBlockNumber():968:968 -> i
+    1:1:int getNextInstructionNumber():919:919 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():944:947 -> k
+    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():947 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():947:949 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():951 -> k
-    10:10:com.android.tools.r8.ir.code.Value getThis():952:952 -> k
-    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1523:1523 -> k
-    11:11:com.android.tools.r8.ir.code.Value getThis():949 -> k
-    1:3:java.util.Set getUnreachableBlocks():1117:1119 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> l
-    4:4:java.util.Set getUnreachableBlocks():1119 -> l
-    5:10:java.util.Set getUnreachableBlocks():1120:1125 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():877:877 -> m
-    1:1:java.lang.Iterable instructions():873:873 -> n
+    9:9:com.android.tools.r8.ir.code.Value getThis():949 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():950:950 -> k
+    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1558:1558 -> k
+    11:11:com.android.tools.r8.ir.code.Value getThis():947 -> k
+    1:3:java.util.Set getUnreachableBlocks():1115:1117 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> l
+    4:4:java.util.Set getUnreachableBlocks():1117 -> l
+    5:10:java.util.Set getUnreachableBlocks():1118:1123 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():875:875 -> m
+    1:1:java.lang.Iterable instructions():871:871 -> n
     1:1:boolean isConsistentGraph():527:527 -> o
-    2:2:boolean noColorsInUse():1075:1075 -> o
+    2:2:boolean noColorsInUse():1073:1073 -> o
     2:2:boolean isConsistentGraph():527 -> o
     3:5:boolean isConsistentGraph():527:529 -> o
     6:21:boolean consistentPredecessorSuccessors():665:680 -> o
@@ -24615,47 +24654,47 @@
     49:57:boolean consistentDefUseChains():624 -> p
     49:57:boolean isConsistentSSA():500 -> p
     58:58:boolean isConsistentSSA():501:501 -> p
-    59:76:boolean validThrowingInstructions():780:797 -> p
-    59:76:boolean isConsistentSSA():501 -> p
-    77:77:boolean isConsistentSSA():502:502 -> p
-    78:89:boolean noCriticalEdges():560:571 -> p
-    78:89:boolean isConsistentSSA():502 -> p
-    90:92:boolean isConsistentSSA():502:504 -> p
-    1:1:java.util.ListIterator listIterator():895:895 -> q
+    59:75:boolean validThrowingInstructions():780:796 -> p
+    59:75:boolean isConsistentSSA():501 -> p
+    76:76:boolean isConsistentSSA():502:502 -> p
+    77:88:boolean noCriticalEdges():560:571 -> p
+    77:88:boolean isConsistentSSA():502 -> p
+    89:91:boolean isConsistentSSA():502:504 -> p
+    1:1:java.util.ListIterator listIterator():893:893 -> q
     1:1:com.android.tools.r8.ir.code.IRMetadata metadata():133:133 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():903:905 -> s
-    1:7:int numberRemainingInstructions():911:917 -> t
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():901:903 -> s
+    1:7:int numberRemainingInstructions():909:915 -> t
     1:7:java.lang.String toString():397:403 -> toString
-    1:1:void removeAllTrivialPhis():1011:1011 -> u
-    1:3:java.util.Set removeUnreachableBlocks():1130:1132 -> v
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> v
-    4:4:java.util.Set removeUnreachableBlocks():1132 -> v
+    1:1:void removeAllTrivialPhis():1009:1009 -> u
+    1:3:java.util.Set removeUnreachableBlocks():1128:1130 -> v
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> v
+    4:4:java.util.Set removeUnreachableBlocks():1130 -> v
     5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> v
-    5:5:java.util.ListIterator listIterator():895 -> v
-    5:5:java.util.Set removeUnreachableBlocks():1133 -> v
+    5:5:java.util.ListIterator listIterator():893 -> v
+    5:5:java.util.Set removeUnreachableBlocks():1131 -> v
     6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> v
-    6:6:java.util.Set removeUnreachableBlocks():1134 -> v
+    6:6:java.util.Set removeUnreachableBlocks():1132 -> v
     7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> v
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> v
-    7:7:java.util.Set removeUnreachableBlocks():1135 -> v
-    8:9:java.util.Set removeUnreachableBlocks():1136:1137 -> v
+    7:7:java.util.Set removeUnreachableBlocks():1133 -> v
+    8:9:java.util.Set removeUnreachableBlocks():1134:1135 -> v
     10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> v
-    10:11:java.util.Set removeUnreachableBlocks():1138 -> v
+    10:11:java.util.Set removeUnreachableBlocks():1136 -> v
     12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> v
     12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> v
-    12:12:java.util.Set removeUnreachableBlocks():1138 -> v
+    12:12:java.util.Set removeUnreachableBlocks():1136 -> v
     13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> v
     13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> v
-    13:13:java.util.Set removeUnreachableBlocks():1138 -> v
+    13:13:java.util.Set removeUnreachableBlocks():1136 -> v
     14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> v
-    14:17:java.util.Set removeUnreachableBlocks():1138 -> v
-    18:19:java.util.Set removeUnreachableBlocks():1141:1142 -> v
-    1:1:int reserveMarkingColor():1032:1032 -> w
-    2:2:boolean anyMarkingColorAvailable():1046:1046 -> w
-    2:2:int reserveMarkingColor():1032 -> w
-    3:11:int reserveMarkingColor():1032:1040 -> w
+    14:17:java.util.Set removeUnreachableBlocks():1136 -> v
+    18:19:java.util.Set removeUnreachableBlocks():1139:1140 -> v
+    1:1:int reserveMarkingColor():1030:1030 -> w
+    2:2:boolean anyMarkingColorAvailable():1044:1044 -> w
+    2:2:int reserveMarkingColor():1030 -> w
+    3:11:int reserveMarkingColor():1030:1038 -> w
     12:13:boolean verifyNoBlocksMarked(int):423:424 -> w
-    12:13:int reserveMarkingColor():1040 -> w
+    12:13:int reserveMarkingColor():1038 -> w
     1:24:void splitCriticalEdges():290:313 -> x
     25:34:void splitCriticalEdges():312:321 -> x
     1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():448:471 -> y
@@ -24665,7 +24704,7 @@
     26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():443 -> y
     1:20:void traceBlocks():352:371 -> z
     21:33:void traceBlocks():370:382 -> z
-    34:34:boolean noColorsInUse():1075:1075 -> z
+    34:34:boolean noColorsInUse():1073:1073 -> z
     34:34:void traceBlocks():382 -> z
     35:35:void traceBlocks():382:382 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
@@ -24802,18 +24841,18 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> A2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> C2
-    1:2:void invert():110:111 -> D2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> D2
-    3:4:void invert():112 -> D2
-    5:5:void invert():113:113 -> D2
-    1:1:boolean isZeroTest():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> F2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> G2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> H2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> C2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> D2
+    1:2:void invert():110:111 -> E2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> E2
+    3:4:void invert():112 -> E2
+    5:5:void invert():113:113 -> E2
+    1:1:boolean isZeroTest():93:93 -> F2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> G2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> H2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> I2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -24844,10 +24883,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> u2
-    1:1:int maxOutValueRegister():179:179 -> v2
-    int opcode() -> w2
-    boolean isIf() -> x1
+    1:1:int maxInValueRegister():174:174 -> v2
+    1:1:int maxOutValueRegister():179:179 -> w2
+    int opcode() -> x2
+    boolean isIf() -> y1
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -24882,18 +24921,19 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> D2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -24924,16 +24964,16 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceGet() -> y1
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
+    boolean isInstanceGet() -> z1
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.D.b.s0:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> A2
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> B2
+    boolean isInstanceOf() -> A1
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> C2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -24948,18 +24988,18 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceOf() -> z1
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean isInstancePut() -> A1
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> C2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> D2
+    boolean isInstancePut() -> B1
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
@@ -24984,10 +25024,9 @@
     1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():170:170 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():170:170 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -25004,85 +25043,86 @@
     26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):45:67 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():591:591 -> A0
-    boolean isInstancePut() -> A1
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
+    boolean isInstanceOf() -> A1
+    boolean throwsOnNullInput() -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1353:1353 -> B0
-    boolean isIntSwitch() -> B1
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    boolean isInstancePut() -> B1
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
-    boolean isIntroducingAnAlias() -> C1
+    boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
-    boolean isInvoke() -> D1
+    boolean isIntroducingAnAlias() -> D1
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     1:2:com.android.tools.r8.ir.code.Position getPosition():79:80 -> E0
-    boolean isInvokeCustom() -> E1
+    boolean isInvoke() -> E1
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     1:1:java.lang.String getPositionAsString():89:89 -> F0
-    boolean isInvokeDirect() -> F1
+    boolean isInvokeCustom() -> F1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
     1:1:boolean hasBlock():289:289 -> G0
-    boolean isInvokeInterface() -> G1
+    boolean isInvokeDirect() -> G1
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     1:1:java.util.List inValues():93:93 -> H0
     1:1:boolean hasInValueWithLocalInfo():107 -> H0
     2:3:boolean hasInValueWithLocalInfo():107:108 -> H0
-    boolean isInvokeMethod() -> H1
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMethodWithReceiver() -> I1
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokePolymorphic() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:boolean instructionInstanceCanThrow():520:520 -> M0
-    boolean isInvokeStatic() -> M1
+    1:1:boolean instructionInstanceCanThrow():524:524 -> M0
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokeSuper() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeVirtual() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    boolean isAnd() -> P0
-    boolean isJumpInstruction() -> P1
+    boolean isAllowedAfterThrowingInstruction() -> P0
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    boolean isArgument() -> Q0
-    boolean isLoad() -> Q1
+    boolean isAnd() -> Q0
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    boolean isArithmeticBinop() -> R0
-    boolean isLogicalBinop() -> R1
+    boolean isArgument() -> R0
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    boolean isArrayGet() -> S0
-    boolean isMonitor() -> S1
+    boolean isArithmeticBinop() -> S0
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
-    boolean isArrayLength() -> T0
-    boolean isMove() -> T1
+    boolean isArrayGet() -> T0
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
-    boolean isArrayPut() -> U0
-    boolean isMoveException() -> U1
+    boolean isArrayLength() -> U0
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
-    boolean isAssume() -> V0
-    boolean isMul() -> V1
+    boolean isArrayPut() -> V0
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
-    boolean isAssumeDynamicType() -> W0
-    boolean isNeg() -> W1
+    boolean isAssume() -> W0
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
-    boolean isAssumeNonNull() -> X0
-    boolean isNewArrayEmpty() -> X1
+    boolean isAssumeDynamicType() -> X0
+    boolean isNeg() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
-    boolean isBinop() -> Y0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isAssumeNonNull() -> Y0
+    boolean isNewArrayEmpty() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
-    boolean isCheckCast() -> Z0
-    boolean isNewInstance() -> Z1
+    boolean isBinop() -> Z0
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -25140,130 +25180,130 @@
     175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
     175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
-    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):542:542 -> a
-    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1289:1290 -> a
-    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1296:1299 -> a
-    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1304:1306 -> a
-    194:200:boolean verifyValidPositionInfo(boolean):1373:1379 -> a
-    201:201:boolean verifyValidPositionInfo(boolean):1375:1375 -> a
+    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1297:1298 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1304:1307 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1312:1314 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1381:1387 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1383:1383 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    boolean isCmp() -> a1
-    boolean isNot() -> a2
+    boolean isCheckCast() -> a1
+    boolean isNewInstance() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     9:15:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):202:208 -> b
     16:16:void printLIR(com.android.tools.r8.utils.CfgPrinter):338:338 -> b
-    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):524:524 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1311:1322 -> b
+    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):528:528 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
-    boolean isConstClass() -> b1
-    boolean isNumberConversion() -> b2
+    boolean isCmp() -> b1
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    boolean isConstInstruction() -> c1
-    boolean isOr() -> c2
+    boolean isConstClass() -> c1
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
-    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):550:554 -> d
+    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstInstruction() -> d1
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    boolean isConstMethodType() -> e1
-    boolean isPop() -> e2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    boolean isConstNumber() -> f1
-    boolean isRem() -> f2
+    boolean isConstMethodType() -> f1
+    boolean isPop() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    boolean isConstString() -> g1
-    boolean isReturn() -> g2
+    boolean isConstNumber() -> g1
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    1:4:boolean isCreatingArray():1268:1271 -> h1
-    boolean isShl() -> h2
+    boolean isConstString() -> h1
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:1:boolean isCreatingInstanceOrArray():1275:1275 -> i1
-    boolean isShr() -> i2
+    1:4:boolean isCreatingArray():1276:1279 -> i1
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:5:boolean isDebugInstruction():1076:1080 -> j1
-    boolean isStaticGet() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    boolean isDebugLocalRead() -> k1
-    boolean isStaticPut() -> k2
+    1:5:boolean isDebugInstruction():1080:1084 -> k1
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isDebugLocalUninitialized() -> l1
-    boolean isStore() -> l2
+    boolean isDebugLocalRead() -> l1
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isDebugLocalWrite() -> m1
-    boolean isStringSwitch() -> m2
+    boolean isDebugLocalUninitialized() -> m1
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isDebugLocalsChange() -> n1
-    boolean isSub() -> n2
+    boolean isDebugLocalWrite() -> n1
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isDebugPosition() -> o1
-    boolean isSwap() -> o2
+    boolean isDebugLocalsChange() -> o1
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    boolean isDexItemBasedConstString() -> p1
-    boolean isSwitch() -> p2
+    boolean isDebugPosition() -> p1
+    boolean isSwap() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isDiv() -> q1
-    boolean isThrow() -> q2
+    boolean isDexItemBasedConstString() -> q1
+    boolean isSwitch() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isDup() -> r1
-    boolean isUnop() -> r2
+    boolean isDiv() -> r1
+    boolean isThrow() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isDup2() -> s1
-    boolean isUshr() -> s2
+    boolean isDup() -> s1
+    boolean isUnop() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    1:1:boolean isFieldGet():852:852 -> t1
-    boolean isXor() -> t2
+    boolean isDup2() -> t1
+    boolean isUshr() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
-    boolean isFieldInstruction() -> u1
-    int maxInValueRegister() -> u2
+    1:1:boolean isFieldGet():856:856 -> u1
+    boolean isXor() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
-    1:1:boolean isFieldPut():856:856 -> v1
-    int maxOutValueRegister() -> v2
+    boolean isFieldInstruction() -> v1
+    int maxInValueRegister() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1263:1263 -> w0
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:boolean isFieldPut():860:860 -> w1
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
-    boolean isIf() -> x1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> x2
+    boolean isGoto() -> x1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    1:1:java.util.Set getDebugValues():595:595 -> y0
-    boolean isInstanceGet() -> y1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> y2
+    1:1:java.util.Set getDebugValues():599:599 -> y0
+    boolean isIf() -> y1
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
-    boolean isInstanceOf() -> z1
-    boolean throwsOnNullInput() -> z2
+    boolean isInstanceGet() -> z1
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
     java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate) -> a
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):18:20 -> a
@@ -25286,15 +25326,15 @@
     int[] keys -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
-    boolean isIntSwitch() -> B1
-    1:7:boolean valid():55:61 -> E2
+    boolean isIntSwitch() -> C1
+    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:1:int getFirstKey():177:177 -> G2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> H2
-    3:3:int getKey(int):206:206 -> H2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> H2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> H2
-    1:1:int[] getKeys():210:210 -> I2
+    1:1:int getFirstKey():177:177 -> H2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> I2
+    3:3:int getKey(int):206:206 -> I2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> I2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> I2
+    1:1:int[] getKeys():210:210 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25344,33 +25384,33 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> A2
-    com.android.tools.r8.graph.DexType getReturnType() -> B2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> C2
-    boolean isInvoke() -> D1
-    java.lang.String getTypeString() -> D2
-    1:1:int requiredArgumentRegisters():108:108 -> E2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> E2
-    2:2:int requiredArgumentRegisters():109 -> E2
-    1:1:java.util.List arguments():103:103 -> F2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> F2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> F2
-    3:3:java.util.List arguments():103:103 -> F2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> F2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> F2
-    6:6:java.util.List arguments():103:103 -> F2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> F2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> F2
-    8:8:java.util.List arguments():103:103 -> F2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> F2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> F2
+    1:1:java.util.List arguments():103:103 -> B2
+    com.android.tools.r8.graph.DexType getReturnType() -> C2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    boolean isInvoke() -> E1
+    java.lang.String getTypeString() -> E2
+    1:1:int requiredArgumentRegisters():108:108 -> F2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> F2
+    2:2:int requiredArgumentRegisters():109 -> F2
+    1:1:java.util.List arguments():103:103 -> G2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> G2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> G2
+    3:3:java.util.List arguments():103:103 -> G2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> G2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> G2
+    6:6:java.util.List arguments():103:103 -> G2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> G2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> G2
+    8:8:java.util.List arguments():103:103 -> G2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> G2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
@@ -25434,10 +25474,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> u2
-    1:1:int maxInValueRegister():213 -> u2
-    2:4:int maxInValueRegister():213:215 -> u2
-    int maxOutValueRegister() -> v2
+    1:1:java.util.List arguments():103:103 -> v2
+    1:1:int maxInValueRegister():213 -> v2
+    2:4:int maxInValueRegister():213:215 -> v2
+    int maxOutValueRegister() -> w2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25465,11 +25505,11 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):30:32 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeCustom() -> E1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> F2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeCustom() -> F1
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -25509,16 +25549,16 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():120 -> toString
     3:3:java.lang.String toString():120:120 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():35:35 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeDirect() -> F1
-    1:1:boolean isInterface():57:57 -> H2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeDirect() -> G1
+    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
@@ -25541,87 +25581,87 @@
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):287:300 -> d
     1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128:143 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:28 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeInterface() -> G1
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):117:117 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):122:122 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):132:132 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:99 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:111 -> f
-    int opcode() -> w2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> B2
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> F2
-    boolean isInvokeMethod() -> H1
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():34:34 -> C2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():38:38 -> G2
     boolean hasInvariantOutType() -> I0
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42 -> a
-    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:80 -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43:43 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():38:38 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):78:83 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85:85 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86:87 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87:87 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):98:106 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):117:117 -> a
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):82 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:109 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():47:47 -> toString
+    1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():60:60 -> B0
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():36:37 -> G2
-    boolean isInvokeMethodWithReceiver() -> I1
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):24:24 -> <init>
+    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():65:65 -> B0
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():38:39 -> H2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):45:45 -> a
-    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):65:79 -> b
-    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):78:78 -> b
-    boolean throwsOnNullInput() -> z2
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):49:49 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):55:55 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):70:84 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):83:83 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.D.b.G0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> F2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> G2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> G2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> G2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> H2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> H2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
@@ -25636,7 +25676,7 @@
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
     11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
     12:15:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:120 -> a
-    16:16:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     16:16:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120 -> a
     17:51:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:154 -> a
     52:52:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186:186 -> a
@@ -25647,20 +25687,20 @@
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176 -> b
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> F2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> G2
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -25672,7 +25712,7 @@
     25:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
     26:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
     27:30:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:147 -> a
-    31:31:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    31:31:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     31:31:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> a
     32:68:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:183 -> a
     69:69:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):199:199 -> a
@@ -25684,70 +25724,70 @@
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46:46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():51:51 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexProto getProto():60:60 -> G2
-    boolean isInvokePolymorphic() -> L1
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):32:33 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():48:48 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexProto getProto():62:62 -> H2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:72 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:78 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:86 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):91:97 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97:98 -> a
-    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):103:105 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):142:142 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):180:180 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134 -> a
-    40:40:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
-    40:40:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:80 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:88 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:99 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:100 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:107 -> a
+    38:40:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:150 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):180:180 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):136 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
+    42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeStatic() -> M1
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():58:58 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:86 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137:137 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):145:145 -> a
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):207:207 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218:218 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):166:203 -> b
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:121 -> e
-    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:131 -> f
-    int opcode() -> w2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:87 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138:138 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:148 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):158:158 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):168:168 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):215:215 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):226:226 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):174:211 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:122 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:132 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):30:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeSuper() -> N1
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
     20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
@@ -25758,40 +25798,40 @@
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):31:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeVirtual() -> O1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):120:120 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):192:192 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:151 -> b
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:158 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):151 -> b
-    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:181 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:102 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):98:98 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):110:114 -> f
-    int opcode() -> w2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):158 -> b
+    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):164:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> A2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> P1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -25829,9 +25869,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.D.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> Q1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -25843,15 +25883,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():61:61 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():61:61 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> F2
-    boolean isLogicalBinop() -> R1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -25891,33 +25931,19 @@
     52:53:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):40:41 -> a
     54:55:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):35:36 -> a
     56:56:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):30:30 -> a
-    57:57:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103:103 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):98:98 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):96:96 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):84:84 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):79:92 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):88:94 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):86:86 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):82:82 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
 com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.D.b.S0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
-    1:1:boolean isEnter():50:50 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> B2
+    1:1:boolean isEnter():50:50 -> B2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> S1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -25928,11 +25954,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
     1:7:java.lang.String getInstructionName():114:120 -> z0
-    boolean throwsOnNullInput() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.D.b.R0:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -25944,11 +25969,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> A2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> B2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> T1
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -25960,23 +25985,23 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> d2
+    1:1:boolean isOutConstant():81:81 -> e2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> A2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> U1
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -25996,14 +26021,14 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():51:51 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> F2
-    boolean isMul() -> V1
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26021,13 +26046,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> W1
+    boolean isNeg() -> X1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -26040,17 +26065,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> A2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> X1
+    boolean isNewArrayEmpty() -> Y1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -26068,12 +26093,12 @@
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> toString
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():41 -> toString
     3:3:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26081,10 +26106,10 @@
     int element_width -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):30:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
@@ -26100,9 +26125,9 @@
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():83:83 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():83:83 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -26110,12 +26135,11 @@
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> A2
-    1:1:boolean isSpillingAllowed():184:184 -> B2
-    1:1:void markNoSpilling():180:180 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> B2
+    1:1:boolean isSpillingAllowed():184:184 -> C2
+    1:1:void markNoSpilling():180:180 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewInstance() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
@@ -26131,6 +26155,7 @@
     12:12:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):131:131 -> a
     13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
     14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
+    boolean isNewInstance() -> a2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
     1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):205 -> b
     2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):205:208 -> b
@@ -26144,9 +26169,9 @@
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():68:68 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26162,9 +26187,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> a2
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26193,9 +26218,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> b2
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26224,8 +26249,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26236,10 +26261,10 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    boolean isOr() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26308,13 +26333,13 @@
     7:7:void setIsStackPhi(boolean):350:350 -> b
     8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
     1:1:void clearDefinitionsUsers():335:335 -> b0
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> c
-    2:2:java.util.List getOperands():171:171 -> c
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> c
-    3:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> c
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> d
+    3:3:java.util.List getOperands():171:171 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> d
+    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> d
     1:1:java.util.List getOperands():171:171 -> d0
     1:1:boolean isTrivialPhi():212:212 -> e0
     1:9:java.lang.String printPhi():302:310 -> f0
@@ -26350,10 +26375,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> e2
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isPop() -> f2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26380,8 +26405,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26400,17 +26425,17 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isRem() -> f2
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> B2
-    1:1:boolean isReturnVoid():42:42 -> C2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> D2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
+    1:1:boolean isReturnVoid():42:42 -> D2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26422,15 +26447,15 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> 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):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
-    boolean isReturn() -> g2
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():97:97 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():97:97 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26442,13 +26467,13 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShl() -> h2
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26460,9 +26485,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShr() -> i2
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26500,8 +26525,8 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> C2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26532,52 +26557,64 @@
     110:110:boolean lambda$instructionMayTriggerMethodInvocation$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):220:220 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
-    boolean isStaticGet() -> j2
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> C2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> D2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):138:139 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):157:167 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):161 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:181 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):187:187 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):207:207 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:214 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:212 -> 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):224:224 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):237:237 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:123 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):230:234 -> c
-    boolean isStaticPut() -> k2
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:34:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:145 -> b
+    30:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
+    36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():151:151 -> v2
-    int opcode() -> w2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():190:190 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26594,17 +26631,17 @@
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):68 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
-    boolean isStore() -> l2
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():57:57 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> E2
+    1:4:boolean valid():44:47 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26614,22 +26651,22 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-    boolean isStringSwitch() -> m2
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():101:101 -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> B2
-    1:8:int maxInOutValueRegisterSize():131:138 -> D2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> F2
+    boolean isCommutative() -> C2
+    1:8:int maxInOutValueRegisterSize():131:138 -> E2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26653,9 +26690,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
-    boolean isSub() -> n2
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26671,29 +26708,29 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):93 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> o2
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    boolean isSwap() -> p2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> A2
-    1:1:int getFallthroughBlockIndex():55:55 -> B2
-    1:1:int numberOfKeys():68:68 -> C2
-    1:1:int[] targetBlockIndices():40:40 -> D2
-    1:1:int numberOfKeys():68:68 -> E2
-    1:1:boolean valid():25 -> E2
-    2:2:boolean valid():26:26 -> E2
-    3:3:int getTargetBlockIndex(int):36:36 -> E2
-    3:3:boolean valid():26 -> E2
-    4:4:int getFallthroughBlockIndex():55:55 -> E2
-    4:4:boolean valid():26 -> E2
-    5:5:boolean valid():26:26 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> F2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> B2
+    1:1:int getFallthroughBlockIndex():55:55 -> C2
+    1:1:int numberOfKeys():68:68 -> D2
+    1:1:int[] targetBlockIndices():40:40 -> E2
+    1:1:int numberOfKeys():68:68 -> F2
+    1:1:boolean valid():25 -> F2
+    2:2:boolean valid():26:26 -> F2
+    3:3:int getTargetBlockIndex(int):36:36 -> F2
+    3:3:boolean valid():26 -> F2
+    4:4:int getFallthroughBlockIndex():55:55 -> F2
+    4:4:boolean valid():26 -> F2
+    5:5:boolean valid():26:26 -> F2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> G2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26701,13 +26738,13 @@
     2:2:int[] targetBlockIndices():40:40 -> d
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
-    boolean isSwitch() -> p2
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
+    boolean isSwitch() -> q2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> B2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26725,27 +26762,27 @@
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():268:268 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
-    boolean isThrow() -> q2
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():49:49 -> v2
-    int opcode() -> w2
+    boolean isThrow() -> r2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():49:49 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> A2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> r2
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
+    boolean isUnop() -> s2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26758,8 +26795,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> s2
-    int opcode() -> w2
+    boolean isUshr() -> t2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26829,8 +26866,8 @@
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
     119:119:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1191 -> a
-    120:136:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1192:1208 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1212 -> a
+    120:136:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1213:1229 -> a
     137:137:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
     137:137:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):831 -> a
     138:149:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):832:843 -> a
@@ -26907,29 +26944,31 @@
     1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):282:283 -> b
     3:6:void linkTo(com.android.tools.r8.ir.code.Value):367:370 -> b
     7:8:java.util.Set aliasedUsers():429:430 -> b
-    9:13:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> b
-    14:14:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> b
-    14:14:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> b
-    15:19:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> b
-    20:21:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
-    22:23:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
-    24:24:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
-    25:31:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
-    32:32:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
-    32:32:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    22:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1193:1205 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
     1:1:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> c
     1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):510 -> c
     2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):511:514 -> c
-    6:7:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
-    8:9:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
-    10:22:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    6:6:boolean lambda$getDynamicLowerBoundType$3(com.android.tools.r8.ir.code.Value):1206:1206 -> d
-    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1227:1227 -> d
     1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):535:536 -> e
     3:8:void clearUsers():545:550 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1194:1194 -> e
+    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
     1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
     3:8:void clearUsersInfo():595:600 -> f
     1:2:void computeNeedsRegister():726:727 -> g
@@ -27061,8 +27100,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27075,8 +27114,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    boolean isXor() -> t2
-    int opcode() -> w2
+    boolean isXor() -> u2
+    int opcode() -> x2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27306,7 +27345,7 @@
     33:33:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     34:34:void rewriteNots():234:234 -> a
     34:34:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
@@ -27536,7 +27575,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27764,7 +27803,7 @@
     4:5:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):324:325 -> <init>
     6:15:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):329:338 -> <init>
     com.android.tools.r8.ir.conversion.CfState$BaseSnapshot asBase() -> a
-    1:1:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    1:1:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     1:1:com.android.tools.r8.ir.conversion.CfState$SlotType getSlotType(com.android.tools.r8.graph.DexType):343 -> a
     2:4:com.android.tools.r8.ir.conversion.CfState$SlotType getSlotType(com.android.tools.r8.graph.DexType):343:345 -> a
     5:9:com.android.tools.r8.ir.conversion.CfState$Slot getLocal(int):371:375 -> a
@@ -27898,7 +27937,7 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
     154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
@@ -28534,7 +28573,7 @@
     203:203:void insertDebugPositions():676 -> a
     203:203:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     204:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
-    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -28545,14 +28584,14 @@
     218:219:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
     220:250:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     220:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     251:251:void joinPredecessorsWithIdenticalPhis():2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     252:252:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     252:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     253:267:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     253:267:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):498:509 -> a
+    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):499:510 -> a
     268:279:void joinPredecessorsWithIdenticalPhis():2576 -> a
     268:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     280:280:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
@@ -28565,10 +28604,10 @@
     283:327:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     283:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     328:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1015:1015 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1013:1013 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
-    346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
@@ -28674,7 +28713,7 @@
     553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
     555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
-    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28683,7 +28722,7 @@
     560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
     563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
-    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28811,119 +28850,119 @@
     966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> a
     967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
     967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987 -> a
-    968:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:989 -> a
-    970:970:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    970:970:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:988 -> a
+    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
     971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
-    972:972:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    972:972:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
-    973:976:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
-    977:977:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
-    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
-    979:979:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
-    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
-    980:981:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1969 -> a
-    982:982:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    982:982:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
-    983:983:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
-    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
-    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
-    985:985:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
-    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
-    986:987:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1645 -> a
-    988:988:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    988:988:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
-    989:992:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
-    993:995:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
-    996:996:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
-    996:996:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
-    997:1001:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
-    1002:1002:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
-    1002:1002:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
-    1003:1013:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
-    1014:1018:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
-    1019:1019:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
-    1019:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
-    1020:1020:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> 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):2157 -> a
-    1021:1022:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
-    1023:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
-    1024:1026:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
-    1024:1026:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1027:1033:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
-    1027:1033:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1034:1034:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
-    1034:1034:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
-    1035:1060:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
-    1061:1065:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
-    1066:1072:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
-    1073:1073:boolean isOffsetProcessed(int):2353:2353 -> a
-    1073:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
-    1073:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
-    1074:1076:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
-    1074:1076:void ensureSuccessorBlock(int,int,boolean):2382 -> a
-    1077:1080:int getBlockStartOffset(int):2337:2340 -> a
-    1077:1080:void ensureSuccessorBlock(int,int,boolean):2383 -> a
-    1081:1081:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
-    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1083:1083:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2387 -> a
-    1084:1084:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1084:1084:void ensureSuccessorBlock(int,int,boolean):2389 -> a
-    1085:1085:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1085:1085:void ensureSuccessorBlock(int,int,boolean):2390 -> a
-    1086:1086:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
-    1087:1087:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
-    1087:1087:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
-    1088:1088:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
-    1088:1088:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
-    1089:1094:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
-    1095:1098:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
-    1099:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
-    1100:1102:void generateSplitEdgeBlocks():2448:2450 -> a
-    1100:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1103:1103:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
-    1103:1103:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
-    1103:1103:void generateSplitEdgeBlocks():2450 -> a
-    1103:1103:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1104:1104:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
-    1104:1104:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
-    1104:1104:void generateSplitEdgeBlocks():2450 -> a
-    1104:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1105:1105:void generateSplitEdgeBlocks():2451:2451 -> a
+    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
+    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
+    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
+    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
+    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
+    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1968 -> a
+    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
+    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
+    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
+    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
+    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1644 -> a
+    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
+    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
+    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
+    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
+    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
+    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
+    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
+    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
+    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2157 -> a
+    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
+    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
+    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
+    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
+    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
+    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
+    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
+    1070:1070:boolean isOffsetProcessed(int):2353:2353 -> a
+    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
+    1070:1070:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
+    1071:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1074:1077:int getBlockStartOffset(int):2337:2340 -> a
+    1074:1077:void ensureSuccessorBlock(int,int,boolean):2383 -> a
+    1078:1078:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
+    1079:1079:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
+    1079:1079:void ensureSuccessorBlock(int,int,boolean):2386 -> a
+    1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
+    1080:1080:void ensureSuccessorBlock(int,int,boolean):2387 -> a
+    1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
+    1081:1081:void ensureSuccessorBlock(int,int,boolean):2389 -> a
+    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
+    1082:1082:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1083:1083:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
+    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
+    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
+    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
+    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
+    1097:1099:void generateSplitEdgeBlocks():2448:2450 -> a
+    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
+    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1100:1100:void generateSplitEdgeBlocks():2450 -> a
+    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1101:1101:void generateSplitEdgeBlocks():2450 -> a
+    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1102:1102:void generateSplitEdgeBlocks():2451:2451 -> a
+    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1103:1104:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
+    1103:1104:void generateSplitEdgeBlocks():2452 -> a
+    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1105:1105:void generateSplitEdgeBlocks():2455:2455 -> a
     1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1106:1107:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1106:1107:void generateSplitEdgeBlocks():2452 -> a
-    1106:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1108:1108:void generateSplitEdgeBlocks():2455:2455 -> a
-    1108:1108:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1109:1109:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
-    1109:1109:void generateSplitEdgeBlocks():2456 -> a
-    1109:1109:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1110:1110:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1110:1110:void generateSplitEdgeBlocks():2457 -> a
-    1110:1110:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1111:1121:void generateSplitEdgeBlocks():2460:2470 -> a
-    1111:1121:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1122:1130:void generateSplitEdgeBlocks():2467:2475 -> a
-    1122:1130:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1131:1136:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
-    1131:1136:void generateSplitEdgeBlocks():2475 -> a
-    1131:1136:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1137:1147:void generateSplitEdgeBlocks():2476:2486 -> a
-    1137:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1148:1150:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1148:1150:void generateSplitEdgeBlocks():2486 -> a
-    1148:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1151:1151:void generateSplitEdgeBlocks():2486:2486 -> a
-    1151:1151:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
-    1152:1152:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
-    1152:1152:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
-    1153:1153:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
-    1154:1154:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
+    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1106:1106:void generateSplitEdgeBlocks():2456 -> a
+    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1107:1107:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
+    1107:1107:void generateSplitEdgeBlocks():2457 -> a
+    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1108:1118:void generateSplitEdgeBlocks():2460:2470 -> a
+    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1119:1127:void generateSplitEdgeBlocks():2467:2475 -> a
+    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
+    1128:1133:void generateSplitEdgeBlocks():2475 -> a
+    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1134:1144:void generateSplitEdgeBlocks():2476:2486 -> a
+    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1145:1147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
+    1145:1147:void generateSplitEdgeBlocks():2486 -> a
+    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1148:1148:void generateSplitEdgeBlocks():2486:2486 -> a
+    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
+    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
+    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
     1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> b
     3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> b
     3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868 -> b
@@ -28943,43 +28982,43 @@
     33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> b
     35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
     35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):997 -> b
-    36:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:999 -> b
-    38:38:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    38:38:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
-    39:43:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
-    44:47:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
-    44:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
-    48:48:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
-    49:54:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
-    55:58:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
-    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
-    61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
-    68:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
-    72:72:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
-    72:72:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
-    73:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
-    76:76:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    76:76:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
-    77:80:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
-    81:81:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
-    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
-    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
-    83:83:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
-    83:83:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
-    84:87:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
-    88:91:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
-    88:91:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
-    92:95:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
-    92:95:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
-    92:95:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
-    96:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
+    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
+    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
+    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
+    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
+    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
+    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
+    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
+    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
+    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
+    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
+    71:71:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
+    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
+    72:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
+    75:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    75:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
+    76:79:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
+    80:80:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
+    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
+    82:82:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
+    83:86:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
+    87:90:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
+    87:90:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
+    91:94:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    95:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    98:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
     99:99:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    99:99:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    100:100:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
-    101:101:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
-    102:102:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
+    100:100:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
+    101:101:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
     1:2:java.util.List getArgumentValues():482:483 -> c
     3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1004 -> c
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
@@ -28989,21 +29028,21 @@
     6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> c
     7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> c
     7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007 -> c
-    8:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1009 -> c
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
-    10:10:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
-    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
-    12:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    12:12:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
-    13:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
-    16:16:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
-    16:16:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
-    17:19:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
-    20:37:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
-    38:38:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
-    39:39:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
-    39:39:void addGoto(int):1254 -> c
-    40:43:void addGoto(int):1255:1258 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
+    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
+    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
+    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
+    12:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
+    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
+    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
+    37:37:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
+    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
+    38:38:void addGoto(int):1254 -> c
+    39:42:void addGoto(int):1255:1258 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():478:478 -> d
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):576:576 -> d
     3:3:void resolveAndBuildNewArrayFilledData(int,int):834:834 -> d
@@ -29013,12 +29052,12 @@
     6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> d
     8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> d
     8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1017 -> d
-    9:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1019 -> d
-    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
-    11:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
-    12:17:void addMoveException(int):1602:1607 -> d
-    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
-    18:23:void addMoveException(int):1607 -> d
+    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
+    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
+    11:16:void addMoveException(int):1602:1607 -> d
+    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
+    17:22:void addMoveException(int):1607 -> d
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():487:487 -> e
     2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1164:1164 -> e
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
@@ -29064,13 +29103,13 @@
     14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214:1214 -> g
     15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> g
     15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
-    16:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1216 -> g
-    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
-    18:18:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
-    19:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
-    21:21:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
-    21:21:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
-    22:24:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
+    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1215 -> g
+    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
+    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
+    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
+    20:20:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
+    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
+    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():848:853 -> h
     7:9:void addThisArgument(int):858:860 -> h
     10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> h
@@ -29082,9 +29121,9 @@
     14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> h
     16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> h
     16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
-    17:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1226 -> h
-    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
-    19:19:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
+    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
+    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
+    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
     1:5:void addThrow(int):1844:1848 -> i
     6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
     6:6:void addThrow(int):1848 -> i
@@ -29097,54 +29136,54 @@
     11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856:1856 -> i
     12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> i
     12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856 -> i
-    13:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1858 -> i
-    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
-    15:15:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
+    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
     1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1863 -> j
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> j
     2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> j
     3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> j
     5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> j
     5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> j
-    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1868 -> j
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
-    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
-    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
-    11:11:boolean isOffsetProcessed(int):2353:2353 -> j
-    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
-    12:15:int getBlockStartOffset(int):2337:2340 -> j
-    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
-    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    20:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    32:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
+    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
+    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
+    10:10:boolean isOffsetProcessed(int):2353:2353 -> j
+    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
+    11:14:int getBlockStartOffset(int):2337:2340 -> j
+    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
+    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    19:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    27:28:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    31:32:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    38:38:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
     39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    41:42:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
+    40:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
     43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
+    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
     1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1231 -> k
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
     2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> k
@@ -29177,13 +29216,13 @@
     3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> m
     5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> m
     5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1745 -> m
-    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
-    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
-    9:10:boolean isIndexProcessed(int):2357:2358 -> m
-    11:12:void ensureSubroutineProcessedInstructions():2375:2376 -> m
-    11:12:boolean isIndexProcessed(int):2360 -> m
-    13:13:boolean isIndexProcessed(int):2361:2361 -> m
+    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1748 -> m
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
+    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
+    8:9:boolean isIndexProcessed(int):2357:2358 -> m
+    10:11:void ensureSubroutineProcessedInstructions():2375:2376 -> m
+    10:11:boolean isIndexProcessed(int):2360 -> m
+    12:12:boolean isIndexProcessed(int):2361:2361 -> m
     1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1873 -> n
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> n
     2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> n
@@ -29227,9 +29266,9 @@
     3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735:1735 -> r
     4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> r
     4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735 -> r
-    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1737 -> r
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
-    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
+    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1736 -> r
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
+    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
     1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1913 -> s
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> s
     2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> s
@@ -29317,541 +29356,553 @@
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List neverMergePrefixes -> O
-    boolean seenNotNeverMergePrefix -> P
+    java.util.List onWaveDoneActions -> O
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
     com.android.tools.r8.utils.CfgPrinter printer -> t
-    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> G
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> H
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> K
-    boolean $assertionsDisabled -> R
+    boolean seenNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
     com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> g
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> j
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> o
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> u
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> J
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> i
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> r
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> s
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> K
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> F
     com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> l
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> C
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> E
-    com.android.tools.r8.graph.DexString highestSortingString -> M
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
+    java.util.List neverMergePrefixes -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> L
+    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> H
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> I
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> L
     com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> G
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> f
-    boolean seenNeverMergePrefix -> Q
+    boolean seenNotNeverMergePrefix -> Q
+    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> I
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> p
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> A
     com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> n
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> J
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> e
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> x
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
-    java.util.List onWaveDoneActions -> N
+    com.android.tools.r8.graph.DexString highestSortingString -> N
     1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):190:190 -> <init>
-    2:163: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):173:334 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    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):191:191 -> <init>
+    2:169: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):174:341 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$21(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682:682 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):678:678 -> a
-    4:4:java.lang.String lambda$new$0(java.lang.String):210:210 -> a
-    5:8:java.util.Set getDesugaredCallSites():338:341 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):442:449 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):382:383 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):451 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):452 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453:453 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):435:436 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
-    31:34:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458:461 -> a
-    35:41:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):465:471 -> a
-    42:43:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):496:497 -> a
-    42:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    44:51:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    44:51:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498 -> a
-    44:51:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    52:52:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498:498 -> a
-    52:52:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    53:57:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):534:538 -> a
-    58:60:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):553:555 -> a
-    61:69:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):619:627 -> a
-    70:71:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):847:848 -> a
-    70:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628 -> a
-    72:72:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    72:72:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):848 -> a
-    72:72:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628 -> a
-    73:74:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):403:404 -> a
-    73:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):629 -> a
-    75:83:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):638:646 -> a
-    84:84:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
-    84:84:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    84:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    85:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    85:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    87:138:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):647:698 -> a
-    139:139:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    139:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):698 -> a
-    140:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):699:699 -> a
-    141:142:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):397:398 -> a
-    141:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):700 -> a
-    143:146:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):704:707 -> a
-    147:149:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    147:149:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    150:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):710:711 -> a
-    152:153:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
-    154:154:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:713 -> a
-    155:156:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    155:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
-    157:158:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):715 -> a
-    159:161:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:718 -> a
-    162:163: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):858:859 -> a
-    162:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
-    164:174:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:731 -> a
-    175:177:com.android.tools.r8.graph.DexType computeOutlineClassType():901:903 -> a
-    175:177:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    178:178:com.android.tools.r8.graph.DexType computeOutlineClassType():903 -> a
-    178:178:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    179:181:com.android.tools.r8.graph.DexType computeOutlineClassType():904:906 -> a
-    179:181:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    182:234:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731:783 -> a
-    235:242:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):777:784 -> a
-    243:243:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    243:243:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    244:244:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):657:657 -> a
-    245:245:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):653:653 -> a
-    246:247:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):728:729 -> a
-    248:248:void addWaveDoneAction(com.android.tools.r8.utils.Action):798:798 -> a
-    249:249:boolean isInWave():808:808 -> a
-    249:249:void addWaveDoneAction(com.android.tools.r8.utils.Action):801 -> a
-    250:250:void addWaveDoneAction(com.android.tools.r8.utils.Action):804:804 -> a
-    251:251:void addWaveDoneAction(com.android.tools.r8.utils.Action):802:802 -> a
-    252:252:void addWaveDoneAction(com.android.tools.r8.utils.Action):799:799 -> a
-    253:253:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):812:812 -> a
-    254:259:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):822:827 -> a
-    260:277:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):826:843 -> a
-    278:288:java.lang.Object lambda$forEachSelectedOutliningMethod$12(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):829:839 -> a
-    289:289:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):869:869 -> a
-    290:293:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):913:916 -> a
-    294:299:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):922:927 -> a
-    300:305:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):931:936 -> a
-    306:306:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    306:306:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937 -> a
-    307:307:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937:937 -> a
-    308:308:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):933:933 -> a
-    309:311:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):954:956 -> a
-    312:312:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):955:955 -> a
-    313:313:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    314:314:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    314:314:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962 -> a
-    315:315:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962:962 -> a
-    316:316:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    317:323:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):979:985 -> a
-    324:326:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1027:1029 -> a
-    327:332:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1028:1033 -> a
-    333:333:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    333:333:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033 -> a
-    334:334:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033:1033 -> a
-    335:348:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1032:1045 -> a
-    349:354:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1839:1844 -> a
-    349:354:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1048 -> a
-    355:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1049:1055 -> a
-    362:362:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
-    362:362:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1055 -> a
-    363:377:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1056:1070 -> a
-    378:378:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    378:378:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070 -> a
-    379:393:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1071:1085 -> a
-    394:394:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1592 -> a
-    394:394:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    395:395:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    395:395:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592 -> a
-    395:395:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    396:398:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1594 -> a
-    396:398:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    399:399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    399:399:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1594 -> a
-    399:399:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    400:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1595:1598 -> a
-    400:403:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    404:408:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1094:1098 -> a
-    409:409:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    409:409:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098 -> a
-    410:417:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1101:1108 -> a
-    418:418:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    418:418:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1109 -> a
-    419:464:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110:1155 -> a
-    465:465:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    465:465:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1155 -> a
-    466:519:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1160:1213 -> a
-    520:522:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):990:992 -> a
-    520:522:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1214 -> a
-    523:531:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1217:1225 -> a
-    532:550:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1224:1242 -> a
-    551:551:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    551:551:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1242 -> a
-    552:575:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1243:1266 -> a
-    576:594:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1258:1276 -> a
-    595:595:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    595:595:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259 -> a
-    596:661:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1279:1344 -> a
-    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    662:662:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1344 -> a
-    663:673:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1345:1355 -> a
-    674:679:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):890:895 -> a
-    674:679:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1355 -> a
-    680:703:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1356:1379 -> a
-    704:708:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
-    704:708:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    709:715:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
-    709:715:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    709:715:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    716:719:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
-    716:719:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    720:724:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1380:1384 -> a
-    725:735:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1455:1465 -> a
-    725:735:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    736:736:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    736:736:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1465 -> a
-    736:736:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    737:745:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1469:1477 -> a
-    737:745:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    746:746:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1388:1388 -> a
-    747:753:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1484:1490 -> a
-    747:753:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    754:754:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    754:754:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1485 -> a
-    754:754:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    755:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1390 -> a
-    756:762:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1547:1553 -> a
-    756:762:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1391 -> a
-    763:786:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1426:1449 -> a
-    763:786:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1392 -> a
-    787:787:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    787:787:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1551 -> a
-    787:787:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1391 -> a
-    788:788:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
-    788:788:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    789:791:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1397:1399 -> a
-    792:792:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
-    792:792:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1399 -> a
-    793:800:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400:1407 -> a
-    801:801:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    801:801:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1410 -> a
-    802:807:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1410:1415 -> a
-    808:808:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    808:808:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415 -> a
-    809:810:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415:1416 -> a
-    811:816:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415:1420 -> a
-    817:817:void lambda$rewriteCodeInternal$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1142:1142 -> a
-    818:818:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1268:1268 -> a
-    819:834:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1498:1513 -> a
-    835:844:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> a
-    835:844:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    845:845:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    845:845:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
-    845:845:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    846:849:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> a
-    846:849:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    850:850:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    850:850:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
-    850:850:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    851:859:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
-    851:859:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    860:860:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    860:860:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    861:861:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    861:861:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
-    861:861:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    862:875:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> a
-    862:875:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    876:931:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
-    876:931:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    932:932:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    932:932:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    933:934:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1516:1517 -> a
-    935:935:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
-    935:935:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1518 -> a
-    936:936:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1519:1519 -> a
-    937:937:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    937:937:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    938:941:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1525:1528 -> a
-    942:950:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1560:1568 -> a
-    942:950:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1528 -> a
-    951:956:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1536:1541 -> a
-    957:957:boolean lambda$computeMayHaveSideEffects$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1537:1537 -> a
-    958:959:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1582:1583 -> a
-    960:960:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    960:960:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1583 -> a
-    961:965:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1602:1606 -> a
-    961:965:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1584 -> a
-    966:966:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1586:1586 -> a
-    967:967:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1611:1611 -> a
-    967:967:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    968:973:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1650:1655 -> a
-    968:973:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    968:973:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    974:974:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1312:1312 -> a
-    974:974:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1655 -> a
-    974:974:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    974:974:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    975:975:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656:1656 -> a
-    975:975:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    975:975:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    976:988:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4309 -> a
-    976:988:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    976:988:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    976:988:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    989:989:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
-    989:989:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310 -> a
-    989:989:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    989:989:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    989:989:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    990:991:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310:4311 -> a
-    990:991:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    990:991:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    990:991:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    992:992:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4297 -> a
-    992:992:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> a
-    992:992:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    992:992:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    993:1002:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1658:1667 -> a
-    993:1002:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    993:1002:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1003:1003:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1666:1666 -> a
-    1003:1003:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1613 -> a
-    1003:1003:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1004:1008:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1614:1618 -> a
-    1004:1008:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1009:1009:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    1009:1009:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618 -> a
-    1009:1009:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1010:1010:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618:1618 -> a
-    1010:1010:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1011:1015:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1617:1621 -> a
-    1011:1015:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1016:1016:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724:1724 -> a
-    1017:1017:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
-    1017:1017:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724 -> a
-    1018:1029:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1727:1738 -> a
-    1030:1032:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1784:1786 -> a
-    1030:1032:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1739 -> a
-    1033:1033:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1742:1742 -> a
-    1034:1035:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1791:1792 -> a
-    1034:1035:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1743 -> a
-    1036:1037:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1796:1797 -> a
-    1036:1037:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1746 -> a
-    1038:1039:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1749:1750 -> a
-    1040:1044:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1770:1774 -> a
-    1040:1044:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1751 -> a
-    1045:1050:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1752:1757 -> a
-    1051:1051: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):1806:1806 -> a
-    1051:1051:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1052:1052:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1052:1052: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):1806 -> a
-    1052:1052:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1053:1063: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):1807:1817 -> a
-    1053:1063:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1064:1065:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1732:1733 -> a
-    1066:1066:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1731:1731 -> a
-    1067:1067:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1779:1779 -> a
-    1068:1068:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1855:1855 -> a
-    1069:1069:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    1069:1069:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1856 -> a
-    1070:1087:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1857:1874 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):477:482 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:491 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):542:551 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):561:589 -> b
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690:690 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):686:686 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
+    5:8:java.util.Set getDesugaredCallSites():345:348 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):449:456 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:390 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460:460 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):442:443 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):464 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466:469 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):473:479 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:505 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506:506 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):542:546 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):561:563 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):627:635 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):886:887 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
+    74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):887 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):410:411 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646:654 -> a
+    86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):655:706 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):404:405 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):712:715 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718:719 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:721 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:726 -> a
+    164:165:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):897:898 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):729:729 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):732:734 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:748 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():948:950 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():950 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():951:953 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748:800 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):794:801 -> a
+    256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):665:665 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):661:661 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):745:746 -> a
+    261:264:void waveStart(java.util.Collection):805:808 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):819:819 -> a
+    266:266:boolean isInWave():829:829 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):822 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):825:825 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):823:823 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):833:833 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):843:848 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):847:864 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):850:860 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):869:869 -> a
+    307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870:872 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):871:882 -> a
+    323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):870 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):916:916 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):960:963 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):969:974 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):978:983 -> a
+    341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):980:980 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1001:1003 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1002:1002 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009:1009 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1026:1032 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1076 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1080 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080:1080 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1079:1092 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1890:1895 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1095 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1096:1102 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1102 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103:1117 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1117 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1118:1132 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1643 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1645 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1645 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1646:1649 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1141:1155 -> a
+    454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1156 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1157:1202 -> a
+    501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1207:1260 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1037:1039 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1261 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1264:1272 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1271:1289 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1289 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1290:1313 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1305:1323 -> a
+    631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1306 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1326:1375 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1375 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1376:1386 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):889:894 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1386 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387:1430 -> a
+    744:748:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
+    749:755:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    756:759:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    760:764:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1431:1435 -> a
+    765:775:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1506:1516 -> a
+    765:775:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    776:776:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    776:776:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1516 -> a
+    776:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    777:785:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1520:1528 -> a
+    777:785:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    786:786:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1439:1439 -> a
+    787:793:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1535:1541 -> a
+    787:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1440 -> a
+    794:794:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    794:794:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1536 -> a
+    794:794:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1440 -> a
+    795:795:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1441:1441 -> a
+    796:802:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1598:1604 -> a
+    796:802:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1442 -> a
+    803:826:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1477:1500 -> a
+    803:826:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1443 -> a
+    827:827:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    827:827:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1602 -> a
+    827:827:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1442 -> a
+    828:828:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
+    828:828:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    829:831:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1448:1450 -> a
+    832:832:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
+    832:832:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450 -> a
+    833:840:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1451:1458 -> a
+    841:841:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    841:841:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1461 -> a
+    842:847:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1461:1466 -> a
+    848:848:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    848:848:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466 -> a
+    849:850:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466:1467 -> a
+    851:856:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466:1471 -> a
+    857:857:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1189:1189 -> a
+    858:858:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1315:1315 -> a
+    859:874:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1549:1564 -> a
+    875:884:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> a
+    875:884:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    885:885:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    885:885:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
+    885:885:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    886:889:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> a
+    886:889:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    890:890:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    890:890:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
+    890:890:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    891:899:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
+    891:899:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    900:900:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
+    900:900:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    901:901:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    901:901:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> a
+    901:901:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    902:915:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> a
+    902:915:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    916:971:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
+    916:971:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    972:972:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    972:972:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    973:974:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1567:1568 -> a
+    975:975:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
+    975:975:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1569 -> a
+    976:976:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    977:977:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    977:977:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    978:981:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1576:1579 -> a
+    982:990:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1611:1619 -> a
+    982:990:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1579 -> a
+    991:996:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1587:1592 -> a
+    997:997:boolean lambda$computeMayHaveSideEffects$18(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1588:1588 -> a
+    998:999:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1633:1634 -> a
+    1000:1000:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1000:1000:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1634 -> a
+    1001:1005:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1653:1657 -> a
+    1001:1005:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1635 -> a
+    1006:1006:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1637:1637 -> a
+    1007:1007:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1662:1662 -> a
+    1007:1007:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1008:1013:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1701:1706 -> a
+    1008:1013:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1008:1013:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1014:1014:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1312:1312 -> a
+    1014:1014:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1706 -> a
+    1014:1014:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1014:1014:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1015:1015:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707:1707 -> a
+    1015:1015:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1015:1015:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1016:1028:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4321 -> a
+    1016:1028:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1016:1028:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1016:1028:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1029:1029:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
+    1029:1029:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322 -> a
+    1029:1029:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1029:1029:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1029:1029:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1030:1031:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322:4323 -> a
+    1030:1031:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1030:1031:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1030:1031:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1032:1032:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4309 -> a
+    1032:1032:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> a
+    1032:1032:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1032:1032:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1033:1042:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1709:1718 -> a
+    1033:1042:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1033:1042:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1043:1043:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1717:1717 -> a
+    1043:1043:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664 -> a
+    1043:1043:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1044:1048:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1665:1669 -> a
+    1044:1048:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1049:1049:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    1049:1049:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669 -> a
+    1049:1049:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1050:1050:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669:1669 -> a
+    1050:1050:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1051:1055:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1668:1672 -> a
+    1051:1055:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1056:1056:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775:1775 -> a
+    1057:1057:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
+    1057:1057:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775 -> a
+    1058:1069:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1778:1789 -> a
+    1070:1072:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1835:1837 -> a
+    1070:1072:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1790 -> a
+    1073:1073:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1793:1793 -> a
+    1074:1075:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1842:1843 -> a
+    1074:1075:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1794 -> a
+    1076:1077:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1847:1848 -> a
+    1076:1077:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    1078:1079:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1800:1801 -> a
+    1080:1084:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1821:1825 -> a
+    1080:1084:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1802 -> a
+    1085:1090:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1803:1808 -> a
+    1091:1091: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):1857:1857 -> a
+    1091:1091:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1092:1092:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1092:1092: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):1857 -> a
+    1092:1092:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1093:1103: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):1858:1868 -> a
+    1093:1103:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1104:1105:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1783:1784 -> a
+    1106:1106:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1782:1782 -> a
+    1107:1107:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1830:1830 -> a
+    1108:1108:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1906:1906 -> a
+    1109:1109:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    1109:1109:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1907 -> a
+    1110:1127:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1908:1925 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):485:490 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):488:499 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):550:559 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):569:597 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589:593 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593:599 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597:601 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601:607 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:604 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:601 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
-    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):602:602 -> b
-    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):737:739 -> b
-    86:86:boolean isInWave():808:808 -> b
-    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):945:947 -> b
-    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1003:1011 -> b
-    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1009:1009 -> b
-    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1627:1632 -> b
-    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1630:1634 -> b
-    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673:1673 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:609 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
+    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> b
+    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):754:756 -> b
+    86:86:boolean isInWave():829:829 -> b
+    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):992:994 -> b
+    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1050:1058 -> b
+    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1056:1056 -> b
+    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1678:1683 -> b
+    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681:1685 -> b
+    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724:1724 -> b
     112:112:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1300:1300 -> b
-    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673 -> b
-    113:117:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1677:1681 -> b
+    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724 -> b
+    113:117:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1728:1732 -> b
     118:118:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
-    118:118:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1682 -> b
-    119:130:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1682:1693 -> b
-    131:131:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1823:1823 -> b
-    131:131:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    118:118:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1733 -> b
+    119:130:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1733:1744 -> b
+    131:131:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1874:1874 -> b
+    131:131:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     132:132:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
-    132:132:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1823 -> b
-    132:132:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    133:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1824:1826 -> b
-    133:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1826 -> b
-    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1827:1829 -> b
-    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    132:132:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1874 -> b
+    132:132:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    133:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1875:1877 -> b
+    133:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
+    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1877 -> b
+    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1878:1880 -> b
+    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     140:140:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
-    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1830 -> b
-    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1832:1834 -> b
-    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
+    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1881 -> b
+    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1883:1885 -> b
+    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
     144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
-    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1835 -> b
-    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    145:149:boolean lambda$workaroundForwardingInitializerBug$17(com.android.tools.r8.ir.code.Instruction):1695:1699 -> b
-    150:151:void printPhase(java.lang.String):1849:1850 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:523 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):522:528 -> c
+    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1886 -> b
+    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    145:149:boolean lambda$workaroundForwardingInitializerBug$19(com.android.tools.r8.ir.code.Instruction):1746:1750 -> b
+    150:151:void printPhase(java.lang.String):1900:1901 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512:531 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):530:536 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528:528 -> c
-    43:43:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):813:813 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536:536 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):834:834 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):814 -> c
-    45:45:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):814:814 -> c
-    46:46:void lambda$computeReachabilitySensitivity$10(com.android.tools.r8.graph.DexEncodedMethod):814:814 -> c
-    47:47:void clearDexMethodCompilationState():865:865 -> c
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):835 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):835:835 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):835:835 -> c
+    47:47:void clearDexMethodCompilationState():912:912 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():364:370 -> d
-    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):536:536 -> d
-    1:1:boolean enableTwrCloseResourceDesugaring():360:360 -> e
-    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):481:481 -> e
-    3:7:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1638:1642 -> e
-    1:2:boolean removeLambdaDeserializationMethods():374:375 -> f
-    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):520:520 -> f
-    1:3:void waveDone():792:794 -> g
-    1:1:void waveStart():788:788 -> h
+    1:7:boolean enableTryWithResourcesDesugaring():371:377 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):544:544 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():367:367 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):489:489 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):874:878 -> e
+    1:2:boolean removeLambdaDeserializationMethods():381:382 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):528:528 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):808:808 -> f
+    1:3:void waveDone():813:815 -> g
+    4:8:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1689:1693 -> g
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():76:76 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):83:83 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):80:85 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):76:76 -> a
-    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):76:76 -> a
-    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):89:93 -> a
-    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):100:110 -> a
-    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):479:499 -> a
-    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):112 -> a
-    40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
+    1:1:void <clinit>():75:75 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):82:82 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):79:84 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):75:75 -> a
+    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):75:75 -> a
+    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):88:92 -> a
+    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):99:109 -> a
+    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
+    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
+    40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    43:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):118:131 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):506:510 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):535:537 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):510 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:527 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    82:98:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:149 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    99:99:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):149 -> a
-    100:103:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150:153 -> a
-    104:144:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):152:192 -> a
-    145:178:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):434:467 -> a
-    145:178:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    179:179:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):458:458 -> a
-    179:179:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    180:180:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):457:457 -> a
-    180:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    181:188:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):194:201 -> a
-    189:220:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):616:647 -> a
-    189:220:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    221:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):203:220 -> a
-    239:255:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):219:235 -> a
-    256:265:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):230:239 -> a
-    266:266:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    266:266:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239 -> a
-    267:273:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239:245 -> a
-    274:274:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    274:274:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):246 -> a
-    275:275:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):246:246 -> a
-    276:282:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):245:251 -> a
-    283:283:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    283:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):252 -> a
-    284:284:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):253:253 -> a
-    285:285:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    285:285:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):254 -> a
-    286:286:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
-    287:287: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
-    287:287:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):259 -> a
-    288:300:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):260:272 -> a
-    301:301:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    301:301:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):272 -> a
-    302:302:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    302:302:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):274 -> a
-    303:322:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):278:297 -> a
-    323:332:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):296:305 -> a
-    333:348:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):304:319 -> a
-    349:365:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):318:334 -> a
-    366:388:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):333:355 -> a
-    389:399:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):354:364 -> a
-    400:406:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):363:369 -> a
-    407:413:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
-    414:420:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:379 -> a
-    421:428:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):378:385 -> a
-    429:435:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):384:390 -> a
-    436:465:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):389:418 -> a
-    466:466:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    466:466:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418 -> a
-    467:471:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418:422 -> a
-    472:478:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):177:183 -> a
-    479:479: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
-    479:479:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):183 -> a
-    480:480:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    480:480:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):542 -> a
-    481:527:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):543:589 -> a
-    528:528:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
-    529:529:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
-    530:530:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):374:374 -> a
-    531:531:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
-    532:532:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
-    533:533:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):396:396 -> a
-    534:539:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):596:601 -> a
-    540:540:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):651:651 -> a
-    541:558:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):655:672 -> 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):391:391 -> b
+    42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
+    43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
+    60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
+    64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
+    105:138:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):439:472 -> a
+    105:138:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    139:139:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):463:463 -> a
+    139:139:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    140:140:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):462:462 -> a
+    140:140:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    141:148:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):177:184 -> a
+    149:180:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):621:652 -> a
+    149:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    181:198:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):186:203 -> a
+    199:215:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):202:218 -> a
+    216:225:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):213:222 -> a
+    226:226:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    226:226:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222 -> a
+    227:237:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222:232 -> a
+    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    238:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):233 -> a
+    239:239:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):234:234 -> a
+    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    240:240:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):235 -> a
+    241:244:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):236:239 -> a
+    245:245:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    245:245:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):240 -> a
+    246:246:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):240:240 -> a
+    247:247:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239:239 -> a
+    248:248:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    248:248:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):243 -> a
+    249:261:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):244:256 -> a
+    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    262:262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):256 -> a
+    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    263:263:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):258 -> a
+    264:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):262:281 -> a
+    284:293:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):280:289 -> a
+    294:309:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):288:303 -> a
+    310:326:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):302:318 -> a
+    327:349:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):317:339 -> a
+    350:360:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):338:348 -> a
+    361:367:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):347:353 -> a
+    368:374:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):352:358 -> a
+    375:381:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):357:363 -> a
+    382:389:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):362:369 -> a
+    390:396:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
+    397:429:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:405 -> a
+    430:436:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):160:166 -> a
+    437:437: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
+    437:437:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):166 -> a
+    438:438:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    438:438:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):547 -> a
+    439:485:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):548:594 -> a
+    486:486:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):348:348 -> a
+    487:487:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):353:353 -> a
+    488:488:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):358:358 -> a
+    489:489:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
+    490:490:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
+    491:491:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
+    492:495:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):409:412 -> a
+    496:505:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):411:420 -> a
+    506:510:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:515 -> a
+    506:510:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    511:513:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):540:542 -> a
+    511:513:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):515 -> a
+    511:513:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    514:530:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):516:532 -> a
+    514:530:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    531:534:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):421:424 -> a
+    535:540:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):601:606 -> a
+    541:541:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):656:656 -> a
+    542:559:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):660:677 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.Z:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
@@ -29859,10 +29910,10 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):683:687 -> <init>
-    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):692:705 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):702:702 -> a
+    1:1:void <clinit>():680:680 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):688:692 -> <init>
+    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
 com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.b0:
     java.util.Deque waves -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
@@ -29874,8 +29925,8 @@
     26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
     31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
     32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
-    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
-    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
     60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
 com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.c0:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
@@ -30018,7 +30069,7 @@
     117:117: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
     118:131: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():1390:1392 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1425:1427 -> 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
@@ -30044,10 +30095,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> 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):961:961 -> 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):959:959 -> 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
@@ -30186,7 +30237,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:70 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:1:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     3:10:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
     11:29:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
@@ -30222,13 +30273,13 @@
     1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1296 -> a
     3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1295 -> a
     4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314 -> a
     15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314:1314 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
     17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
     18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -30279,12 +30330,12 @@
     340:340:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1031:1031 -> b
     1:3:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:76 -> c
     1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     4:4:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):76 -> c
     4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     5:7:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:79 -> c
     5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
     8:8:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77 -> c
     8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     9:34:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):85:110 -> c
@@ -30299,23 +30350,23 @@
     99:123:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1004:1028 -> e
     124:148:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1025:1049 -> e
     149:157:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1046:1054 -> e
-    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
     158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
     159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
-    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
     166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
     167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
     1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
     14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
     30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
     32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
     33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
     34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
@@ -30347,18 +30398,18 @@
     32:45:void process(com.android.tools.r8.graph.DexClass):73:86 -> a
     46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):144:191 -> a
     46:93:void process(com.android.tools.r8.graph.DexClass):96 -> a
-    94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> a
+    94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
     94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     94:94:void process(com.android.tools.r8.graph.DexClass):96 -> a
     95:95:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
+    95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
     95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     95:95:void process(com.android.tools.r8.graph.DexClass):96 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
+    96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
     96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     96:96:void process(com.android.tools.r8.graph.DexClass):96 -> a
-    97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
+    97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
     97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
     97:97:void process(com.android.tools.r8.graph.DexClass):96 -> a
     98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):194:205 -> a
@@ -30497,58 +30548,92 @@
 com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.D.d.q:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):51:53 -> <init>
-    1:5:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):95:99 -> a
-    6:6:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):113:113 -> a
-    7:7:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    7:7:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114 -> a
-    8:8:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114:114 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    9:9:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):114 -> a
-    10:10:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):115:115 -> a
-    11:26:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):121:136 -> a
-    27:28: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):222:223 -> a
-    27:28:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    29:29: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):239:239 -> a
-    29:29: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):223 -> a
-    29:29:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    30:30:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    30:30: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):239 -> a
-    30:30: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):223 -> a
-    30:30:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    31:31:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    31:31: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):239 -> a
-    31:31: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):223 -> a
-    31:31:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    32:34: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):224:226 -> a
-    32:34:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    35:62:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):143:170 -> a
-    63:66: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):213:216 -> a
-    63:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    67:67: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):239:239 -> a
-    67:67: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):216 -> a
-    67:67:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    68:68:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    68:68: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):239 -> a
-    68:68: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):216 -> a
-    68:68:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    69:69: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):239 -> a
-    69:69: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):216 -> a
-    69:69:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    70:70: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):217:217 -> 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):172 -> a
-    71:93:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):171:193 -> a
-    94:94: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
-    94:94:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):189 -> a
-    95:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):197:207 -> a
-    106:109:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:235 -> a
-    110:110:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):234:234 -> a
-    111:111:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):61 -> a
-    112:137:void desugar(com.android.tools.r8.ir.code.IRCode):62:87 -> a
+    java.util.Map callBackMethods -> d
+    com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):64:64 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):62:67 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):72:72 -> a
+    2:13:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):111:122 -> a
+    2:13:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    14:33:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):132:151 -> a
+    14:33:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):125 -> a
+    14:33:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    34:34:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):126:126 -> a
+    34:34:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    35:35:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    35:35:void desugar(com.android.tools.r8.ir.code.IRCode):78 -> a
+    36:54:void desugar(com.android.tools.r8.ir.code.IRCode):79:97 -> a
+    55:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):235:246 -> a
+    55:66:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    67:68: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):326:327 -> a
+    67:68:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    67:68:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    69:69: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):350:350 -> a
+    69:69: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):327 -> a
+    69:69:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    69:69:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    70:70:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    70:70: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):350 -> a
+    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):327 -> 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):249 -> a
+    70:70:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> 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):959:959 -> 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):350 -> 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):327 -> 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):249 -> a
+    71:71:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    72:74:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):328:330 -> a
+    72:74:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    72:74:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    75:98:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):252:275 -> a
+    75:98:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    99:102: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):317:320 -> a
+    99:102:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    99:102:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    103:103: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):350:350 -> a
+    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):320 -> 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):277 -> a
+    103:103:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    104:104:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    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):350 -> 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):320 -> 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):277 -> a
+    104:104:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    105:105: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):350 -> a
+    105:105: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):320 -> a
+    105:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    105:105:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    106:106: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):321:321 -> a
+    106:106:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    106:106:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    107:128:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):276:297 -> a
+    107:128:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    129:129: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
+    129:129:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):293 -> a
+    129:129:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    130:130:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():16:16 -> a
+    130:130:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):301 -> a
+    130:130:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    131:140:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):302:311 -> a
+    131:140:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    141:143:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:175 -> a
+    144:158:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):179:193 -> a
+    159:164:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):199:204 -> a
+    165:169:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):209:213 -> a
+    170:180:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):336:346 -> a
+    181:181:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):345:345 -> a
+    182:183:boolean canConvert(com.android.tools.r8.graph.DexType):354:355 -> a
+    1:10:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):160:169 -> b
+    11:11:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):227:227 -> b
+    12:12:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> b
+    12:12:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228 -> b
+    13:13:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228:228 -> b
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    14:14:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):228 -> b
+    15:15:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):229:229 -> b
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30559,7 +30644,7 @@
     java.util.Map customConversions -> f
     1:9:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List):59:67 -> <init>
     1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):71:71 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):72 -> a
     3:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):73:73 -> a
     4:4:java.util.Map getBackportCoreLibraryMember():97:97 -> a
@@ -30589,12 +30674,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30602,34 +30687,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30682,7 +30767,91 @@
     88:88:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48:48 -> a
     89:91:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     89:91:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48 -> a
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.v:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.D.d.u:
+    java.util.Map typeWrappers -> b
+    java.util.Map vivifiedTypeWrappers -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexItemFactory factory -> f
+    java.util.Set invalidWrappers -> d
+    java.util.Set generatedWrappers -> e
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> g
+    1:1:void <clinit>():95:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):115:115 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):101:118 -> <init>
+    1:5:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):130:134 -> a
+    6:6:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159:159 -> a
+    7:7:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    7:7:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159 -> a
+    8:36:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159:187 -> a
+    37:38:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):178:179 -> a
+    39:41:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    39:41:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):181 -> a
+    42:42:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):189:189 -> a
+    43:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):165:166 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):168 -> a
+    46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):168:168 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    47:47:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):167 -> a
+    48:49:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):169:170 -> a
+    50:50:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193:193 -> a
+    51:55:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> a
+    51:55:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    56:59:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:198 -> a
+    60:96:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):293:329 -> a
+    60:96:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    97:102:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> a
+    97:102:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):331 -> a
+    97:102:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    103:103:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:195 -> a
+    104:121:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):219:236 -> a
+    122:125:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):430:433 -> a
+    122:125:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    126:134:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):431:439 -> a
+    126:134:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    135:140:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    135:140:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):435 -> a
+    135:140:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    141:145:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240:244 -> a
+    146:146:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):346:346 -> a
+    147:147:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):346:346 -> a
+    148:157:void reportFinalMethodsInWrapper(java.util.Set):346:355 -> a
+    158:158:void reportFinalMethodsInWrapper(java.util.Set):350:350 -> a
+    159:167:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):361:369 -> a
+    168:206:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):374:412 -> a
+    207:209:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):461:463 -> a
+    210:210:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478:478 -> a
+    211:215:boolean verifyAllClassesGenerated():489:493 -> a
+    211:215:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478 -> a
+    216:219:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):479:482 -> a
+    220:221:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):500:501 -> a
+    220:221:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):483 -> a
+    222:222:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):484:484 -> a
+    223:231:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):505:513 -> a
+    232:232:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):508:508 -> a
+    233:233:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):507:507 -> a
+    234:236:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):533:535 -> a
+    237:261:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):534:558 -> a
+    262:267:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    262:267:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):560 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:4:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):204:206 -> b
+    5:9:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> b
+    5:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206 -> b
+    10:10:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210:210 -> b
+    11:48:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):249:286 -> b
+    11:48:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    49:54:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> b
+    49:54:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):288 -> b
+    49:54:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    55:55:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207:207 -> b
+    56:63:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:524 -> b
+    64:64:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> b
+    65:65:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):518:518 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):142:142 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):122:122 -> d
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.w:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -30697,399 +30866,391 @@
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):133:133 -> <init>
     2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):102:139 -> <init>
-    1:10:void initializeEmulatedInterfaceVariables():147:156 -> a
-    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
-    12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164 -> a
-    13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164:166 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
-    17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:170 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):169 -> a
-    26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):167:167 -> a
-    27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):181:190 -> a
+    1:10:void initializeEmulatedInterfaceVariables():143:152 -> a
+    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:159 -> a
+    12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
+    13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
+    17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
+    26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
+    27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
     37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):191 -> a
-    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):193:236 -> a
-    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
-    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):237 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):238:238 -> a
-    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236:244 -> a
-    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> a
-    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:246 -> a
-    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244:275 -> a
-    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:276 -> a
-    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279:280 -> a
-    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:294 -> a
-    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293 -> a
-    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:295 -> a
-    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):297:297 -> a
-    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:333 -> a
-    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:335 -> a
-    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:342 -> a
-    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> a
-    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> a
-    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):344:344 -> a
-    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):342:342 -> a
-    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):316:318 -> a
+    37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):187 -> a
+    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318 -> a
-    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318:366 -> a
-    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366 -> a
-    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:378 -> a
-    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):240:240 -> a
-    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):390:391 -> a
-    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):541:542 -> a
-    287:288:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
-    289:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
-    291:293:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    291:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    294:294:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    294:294:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    295:296:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):396:397 -> a
-    297:297:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):393:393 -> a
-    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468:472 -> a
-    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):476:507 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
+    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    287:288:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):387 -> a
+    289:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:389 -> a
+    291:293:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    291:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    294:294:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    294:294:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    295:296:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
+    297:297:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):389:389 -> a
+    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
+    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
     335:335:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
+    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
     336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
-    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507:521 -> a
+    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
     352:352:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
+    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
     353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
-    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521:521 -> a
-    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):528:528 -> a
-    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):591:609 -> a
-    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):759:768 -> a
-    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):780:781 -> a
-    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):775:775 -> a
-    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):782 -> a
-    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):783 -> a
-    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792:796 -> a
-    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):796 -> a
-    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):841:850 -> a
-    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):847:847 -> a
-    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):930:932 -> a
-    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968:968 -> a
-    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968 -> a
-    414:417:java.util.Map processEmulatedInterfaceHierarchy():579:582 -> a
-    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560 -> a
-    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):561:568 -> a
-    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:640 -> a
-    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
+    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
+    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
+    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
+    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
+    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
+    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
+    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641 -> a
-    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    428:428:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641:641 -> a
-    428:428:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    428:428:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    429:429:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> a
-    429:429:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642 -> a
-    429:429:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    429:429:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    430:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:645 -> a
-    430:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    430:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):644:650 -> a
-    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652 -> a
-    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652:652 -> a
-    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651:670 -> a
-    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):616:624 -> a
-    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670 -> a
-    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:675 -> a
-    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    476:478:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676:676 -> a
-    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):674:674 -> a
-    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:671 -> a
-    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:690 -> a
-    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694 -> a
-    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694:694 -> a
-    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    492:494:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695:695 -> a
-    495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):693:693 -> a
-    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:701 -> a
-    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    500:502:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    500:502:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703:703 -> a
-    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):702:702 -> a
-    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:742 -> a
-    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570 -> a
-    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570:571 -> a
-    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    500:502:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    500:502:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     551:551:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    551:551:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641 -> a
-    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    552:560:void duplicateEmulatedInterfaces():940:948 -> a
-    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    552:560:void duplicateEmulatedInterfaces():936:944 -> a
+    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     561:561:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    561:561:void duplicateEmulatedInterfaces():950 -> a
-    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    562:562:void duplicateEmulatedInterfaces():950:950 -> a
-    562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    563:565:void duplicateEmulatedInterfaces():949:951 -> a
-    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    561:561:void duplicateEmulatedInterfaces():946 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    562:562:void duplicateEmulatedInterfaces():946:946 -> a
+    562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    563:565:void duplicateEmulatedInterfaces():945:947 -> a
+    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     566:566:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    566:566:void duplicateEmulatedInterfaces():951 -> a
-    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    567:568:void duplicateEmulatedInterfaces():951:952 -> a
-    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    566:566:void duplicateEmulatedInterfaces():947 -> a
+    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    567:568:void duplicateEmulatedInterfaces():947:948 -> a
+    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
     569:569:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    569:569:void duplicateEmulatedInterfaces():952 -> a
-    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    570:572:void duplicateEmulatedInterfaces():952:954 -> a
-    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:975 -> a
-    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1030:1031 -> a
-    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1032 -> a
-    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1033:1036 -> a
-    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:981 -> a
-    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1015 -> a
-    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1016 -> a
-    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1017:1026 -> a
-    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986:990 -> a
-    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990 -> a
-    616:617:void renameEmulatedInterfaces():885:886 -> a
-    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):898:906 -> a
-    618:626:void renameEmulatedInterfaces():887 -> a
-    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):917:918 -> a
-    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    627:628:void renameEmulatedInterfaces():887 -> a
-    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):919 -> a
-    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    629:629:void renameEmulatedInterfaces():887 -> a
-    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):919:920 -> a
-    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    630:631:void renameEmulatedInterfaces():887 -> a
-    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):920 -> a
-    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    632:632:void renameEmulatedInterfaces():887 -> a
-    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):908:910 -> a
-    633:635:void renameEmulatedInterfaces():887 -> a
-    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    636:638:void renameEmulatedInterfaces():888:890 -> a
-    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    639:639:void renameEmulatedInterfaces():890 -> a
-    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    640:640:void renameEmulatedInterfaces():890:890 -> a
-    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):924:926 -> a
-    641:643:void renameEmulatedInterfaces():891 -> a
-    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):994:994 -> a
-    645:647:void clear():1001:1003 -> a
-    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1040:1054 -> a
-    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1047:1047 -> a
-    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071:1071 -> a
-    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
-    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071 -> a
-    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1074:1077 -> a
-    670:670:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093:1093 -> a
-    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1107 -> a
-    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1063:1064 -> a
-    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109 -> a
-    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110:1129 -> a
-    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> a
-    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    569:569:void duplicateEmulatedInterfaces():948 -> a
+    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    570:572:void duplicateEmulatedInterfaces():948:950 -> a
+    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    616:617:void renameEmulatedInterfaces():881:882 -> a
+    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    618:626:void renameEmulatedInterfaces():883 -> a
+    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    627:628:void renameEmulatedInterfaces():883 -> a
+    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    629:629:void renameEmulatedInterfaces():883 -> a
+    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    630:631:void renameEmulatedInterfaces():883 -> a
+    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    632:632:void renameEmulatedInterfaces():883 -> a
+    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
+    633:635:void renameEmulatedInterfaces():883 -> a
+    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    636:638:void renameEmulatedInterfaces():884:886 -> a
+    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    639:639:void renameEmulatedInterfaces():886 -> a
+    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    640:640:void renameEmulatedInterfaces():886:886 -> a
+    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    641:643:void renameEmulatedInterfaces():887 -> a
+    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    645:647:void clear():997:999 -> a
+    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    670:670:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1089:1089 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1105 -> a
+    673:674:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
-    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     697:697:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
-    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
-    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1149 -> a
-    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    716:716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098:1098 -> a
-    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1115 -> a
-    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    698:698:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129:1145 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    716:716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1094:1094 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109:1111 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     720:720:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115 -> a
-    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115:1115 -> a
-    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    1:1:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
-    2:2:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):175:175 -> b
-    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:532 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
-    4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532 -> b
-    5:9:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:536 -> b
-    10:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):752:753 -> b
-    12:12:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):746:746 -> b
-    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):754 -> b
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
-    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):755 -> b
-    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> b
-    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:811 -> c
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
-    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:814 -> c
-    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:813 -> c
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c
-    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):815 -> c
-    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> c
-    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> c
-    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    12:12:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):835:835 -> c
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> d
-    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1082 -> d
-    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):806:806 -> d
-    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1083 -> d
-    5:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1085:1086 -> d
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1111 -> a
+    721:721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
+    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
+    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> c
+    7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):809:809 -> c
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
+    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
+    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> c
+    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    12:12:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):831:831 -> c
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> d
+    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1077:1078 -> d
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):802:802 -> d
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079 -> d
+    5:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1082 -> d
     7:7:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> d
-    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1086 -> d
-    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):402:404 -> e
-    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):420:462 -> e
-    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):412:412 -> e
-    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):550:555 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.D.d.u:
+    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1082 -> d
+    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):398:400 -> e
+    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):416:458 -> e
+    4:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):408:408 -> e
+    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):546:551 -> e
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.D.d.v:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:5:void <clinit>():126:130 -> <clinit>
     1:1:void <init>(java.lang.String,int):122:122 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.D.d.w:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.D.d.x:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -31133,15 +31294,15 @@
     147:147:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):330:330 -> a
     147:147:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):120 -> a
     148:166:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):155:173 -> a
-    167:167:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
+    167:167:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     167:167:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):173 -> a
     168:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):174:194 -> a
     189:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):198:222 -> a
-    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
+    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
     214:214:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):222 -> a
     215:229:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:238 -> a
     230:282:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):215:267 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.D.d.x:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.D.d.y:
     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
@@ -31153,7 +31314,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.D.d.E:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.D.d.F:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexField lambdaField -> g
@@ -31171,7 +31332,7 @@
     2:40:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):65:103 -> <init>
     41:47:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     22:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31227,7 +31388,7 @@
     52:52:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean) -> e
     52:52:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> e
     53:60:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():172:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.D.d.y:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.D.d.z:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():665:665 -> <clinit>
@@ -31238,27 +31399,27 @@
     3:26:boolean ensureAccessibility():675:698 -> a
     27:27:boolean ensureAccessibility():696:696 -> a
     28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):691:691 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.D.d.z:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.D.d.A:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):624:625 -> <init>
     1:24:boolean ensureAccessibility():632:655 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.D.d.A:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.D.d.B:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():574:574 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):576:577 -> <init>
     1:27:boolean ensureAccessibility():584:610 -> a
     28:35:boolean ensureAccessibility():609:616 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.D.d.B:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.D.d.C:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):543:543 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.D.d.C:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.D.d.D:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():553:553 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):555:556 -> <init>
     1:5:boolean ensureAccessibility():562:566 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.D.d.D:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.D.d.E:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -31267,7 +31428,7 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):494:498 -> <init>
     boolean ensureAccessibility() -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):505:505 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.D.d.F:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.D.d.G:
     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>
@@ -31276,7 +31437,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.D.d.G:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.D.d.H:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
@@ -31286,13 +31447,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.D.d.H:
+com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.D.d.I:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
     1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):37:37 -> a
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> c
     1:21:void prepareInstructions():24:44 -> h
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.D.d.I:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.D.d.J:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -31339,7 +31500,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.D.d.J:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.D.d.K:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):28:28 -> <init>
@@ -31348,7 +31509,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):426:426 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> 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
@@ -31358,12 +31519,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31375,7 +31536,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):426:426 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31421,7 +31582,7 @@
     80:81:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
     80:81:void prepareInstructions():222 -> h
     82:112:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.D.d.K:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.D.d.M:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -31434,113 +31595,123 @@
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):91:91 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):73:102 -> <init>
-    1:7:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):111:117 -> a
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    8:8:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
-    9:18:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:128 -> a
-    19:30: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):335:346 -> a
-    19:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    31:31:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    31:31: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 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    32:32: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):345 -> a
-    32:32:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    33:66: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):348:381 -> a
-    33:66:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    67:67:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    67:67: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):381 -> a
-    67:67:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    68:68:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    68:68: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):383 -> a
-    68:68:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    69:72: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):384:387 -> a
-    69:72:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    73:73:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    73:73: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):393 -> a
-    73:73:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    74:88: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):394:408 -> a
-    74:88:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    89:90:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    89: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):410 -> a
-    89:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    91:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):410:411 -> a
-    91:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    93:94:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:138 -> a
-    95:95:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    95:95:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    96:98:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    99:106:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):148:155 -> a
-    107:117:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):423:433 -> a
-    107:117:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    118:118:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    118:118:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):433 -> a
-    118:118:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    119:119:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    119:119:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):432 -> a
-    119:119:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    120:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):438:455 -> a
-    120:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    138:139:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    138:139:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457 -> a
-    138:139:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    140:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457:458 -> a
-    140:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    142:144:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):163:165 -> a
-    145:145:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):164:164 -> a
-    146:154:boolean removeLambdaDeserializationMethods(java.lang.Iterable):173:181 -> a
-    155:155:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    155:155:boolean removeLambdaDeserializationMethods(java.lang.Iterable):181 -> a
-    156:158:boolean removeLambdaDeserializationMethods(java.lang.Iterable):182:184 -> a
-    159:165:void adjustAccessibility():200:206 -> a
-    166:166:void adjustAccessibility():205:205 -> a
-    167:168:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):215:216 -> a
-    169:178:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):222:231 -> a
-    179:179:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228:228 -> a
-    180:184:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):250:254 -> a
-    185:185:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):253:253 -> a
-    186:195:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):264:273 -> a
-    196:196:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    196:196:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
-    197:204:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):274:281 -> a
-    205:205:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    205:205:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296 -> a
-    205:205:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    206:206:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    206:206:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297 -> a
-    206:206:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    207:207:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):298:298 -> a
-    207:207:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    208:208:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    208:208:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):299 -> a
-    208:208:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    209:215:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300:306 -> a
-    209:215:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    216:216:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):305:305 -> a
-    216:216:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    217:217:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):304 -> a
-    217:217:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    218:218:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
-    218:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    219:219:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):288:288 -> a
-    220:220:boolean isInMainDexList(com.android.tools.r8.graph.DexType):258:258 -> a
-    220:220:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):289 -> a
-    221:221:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):290:290 -> a
-    222:224:java.lang.Object getKnown(java.util.Map,java.lang.Object):310:312 -> a
-    225:232:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):316:323 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):88:88 -> b
-    2:4:java.util.Set getDesugaredCallSites():236:238 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.D.d.L:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):94:94 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):76:105 -> <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):56:56 -> 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):56:56 -> a
+    3:18:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):110:125 -> a
+    19:19:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):123:123 -> a
+    20:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:150 -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
+    28:37:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:161 -> a
+    38: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):368:379 -> a
+    38:49:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    50:50:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    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):379 -> a
+    50:50:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> 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):959:959 -> 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):378 -> a
+    51:51:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    52:85: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):381:414 -> a
+    52:85:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    86:86:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    86:86: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):414 -> a
+    86:86:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    87:87:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    87:87: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):416 -> a
+    87:87:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    88:91:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):417:420 -> a
+    88:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    92:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):426 -> a
+    92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    93: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):427:441 -> a
+    93:107:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    108:109:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    108:109: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):443 -> a
+    108:109:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    110:111: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):443:444 -> a
+    110:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170:171 -> a
+    114:114:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    114:114:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171 -> a
+    115:117:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171:173 -> a
+    118:125:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):181:188 -> a
+    126:136:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):456:466 -> a
+    126:136:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    137:137:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    137:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):466 -> a
+    137:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    138:138:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465 -> a
+    138:138:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    139:156:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):471:488 -> a
+    139:156:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    157:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    157:158:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490 -> a
+    157:158:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    159:160:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490:491 -> a
+    159:160:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    161:163:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):196:198 -> a
+    164:164:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):197:197 -> a
+    165:173:boolean removeLambdaDeserializationMethods(java.lang.Iterable):206:214 -> a
+    174:174:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    174:174:boolean removeLambdaDeserializationMethods(java.lang.Iterable):214 -> a
+    175:177:boolean removeLambdaDeserializationMethods(java.lang.Iterable):215:217 -> a
+    178:184:void adjustAccessibility():233:239 -> a
+    185:185:void adjustAccessibility():238:238 -> a
+    186:187:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):248:249 -> a
+    188:197:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):255:264 -> a
+    198:198:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):261:261 -> a
+    199:203:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):283:287 -> a
+    204:204:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):286:286 -> a
+    205:214:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):297:306 -> a
+    215:215:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    215:215:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    216:223:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):307:314 -> a
+    224:224:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    224:224:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):329 -> a
+    224:224:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    225:225:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    225:225:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):330 -> a
+    225:225:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    226:226:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):331:331 -> a
+    226:226:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    227:227:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    227:227:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332 -> a
+    227:227:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    228:234:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):333:339 -> a
+    228:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    235:235:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:338 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    236:236:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    236:236:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):337 -> a
+    236:236:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    237:237:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):335:335 -> a
+    237:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321:321 -> a
+    239:239:boolean isInMainDexList(com.android.tools.r8.graph.DexType):291:291 -> a
+    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):322 -> a
+    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):323:323 -> a
+    241:243:java.lang.Object getKnown(java.util.Map,java.lang.Object):343:345 -> a
+    244:251:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):349:356 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
+    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
+    com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> c
+    com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> e
+    com.android.tools.r8.graph.DexEncodedMethod val$method -> d
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod):125:125 -> <init>
+    1:4:void registerCallSite(com.android.tools.r8.graph.DexCallSite):129:132 -> a
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.D.d.N:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> b
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.D.d.O:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.D.d.Q:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -31573,33 +31744,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1262 -> a
+    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1277 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1264 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> b
@@ -31620,7 +31791,7 @@
     12:12:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
     13:15:void processNest(java.util.List):136:138 -> d
     13:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.D.d.M:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.D.d.O:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
@@ -31639,7 +31810,7 @@
     2:2:boolean isGet():454:454 -> g
     2:2:boolean isStaticGet():470 -> g
     1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.D.d.N:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.D.d.P:
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass currentClass -> c
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> e
@@ -31669,7 +31840,7 @@
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> d
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):365:365 -> e
     1:1:void setContext(com.android.tools.r8.graph.DexMethod):335:335 -> f
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.D.d.P:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.D.d.S:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexType nestConstructorType -> k
     java.util.Map putFieldMap -> m
@@ -31686,66 +31857,67 @@
     boolean isLegitimateToHaveEmptyMappings() -> e
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> f
     1:6:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):92:97 -> g
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.D.d.T:
-    1:1:void <init>():18:18 -> <init>
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.D.d.V:
+    1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.D.d.Q:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.D.d.T:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> e
     java.util.Set notRewritten -> a
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):41:41 -> <init>
-    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):36:48 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):54:54 -> <init>
+    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):49:61 -> <init>
     boolean isRewriting() -> a
-    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):52:52 -> a
-    2:25:void validatePrefixes(java.util.Map):56:79 -> a
+    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):65:65 -> a
+    2:25:void validatePrefixes(java.util.Map):69:92 -> a
     26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    26:26:void validatePrefixes(java.util.Map):79 -> a
+    26:26:void validatePrefixes(java.util.Map):92 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    27:27:void validatePrefixes(java.util.Map):79 -> a
-    28:28:void validatePrefixes(java.util.Map):79:79 -> a
-    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:109 -> a
-    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):88:92 -> b
-    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113:113 -> b
-    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    27:27:void validatePrefixes(java.util.Map):92 -> a
+    28:28:void validatePrefixes(java.util.Map):92:92 -> a
+    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:122 -> a
+    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):101:105 -> b
+    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126:126 -> b
+    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     7:7:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):470 -> b
-    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     8:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):474:476 -> b
-    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114:114 -> b
-    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):124:127 -> b
-    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127:127 -> b
+    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):137:140 -> b
+    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     16:16:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):448 -> b
-    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     17:34:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):449:466 -> b
-    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):128:129 -> b
-    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):118:118 -> b
-    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.D.d.S:
-    1:1:void <init>():142:142 -> <init>
+    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):141:142 -> b
+    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
+    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.D.d.U:
+    1:1:void <init>():155:155 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.D.d.U:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.D.d.W:
     boolean $assertionsDisabled -> k
     java.util.Map lensGetFieldBridges -> i
     java.util.Map lensPutFieldBridges -> j
@@ -31755,7 +31927,7 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
@@ -31772,7 +31944,7 @@
     40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
     47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
     51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.D.d.a0:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.D.d.c0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -31849,8 +32021,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.D.d.V:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.D.d.Z:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.D.d.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.D.d.b0:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -31873,7 +32045,7 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     11:11:void desugar():342 -> a
     12:12:void desugar():343:343 -> a
-    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
@@ -31889,30 +32061,30 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.D.d.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.D.d.Y:
     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.D.d.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.D.d.Z:
     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.D.d.Y:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.D.d.a0:
     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):961:961 -> 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):959:959 -> 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.D.d.b0:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.D.d.d0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -31927,7 +32099,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.D.d.c0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.D.d.e0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -31940,34 +32112,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     39:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     49:49:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     51:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282:282 -> a
@@ -31976,27 +32148,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     63:63:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     65:65:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     71:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -32005,27 +32177,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     79:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     81:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     83:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     85:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     87:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311:311 -> a
@@ -32034,34 +32206,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     97:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     99:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     101:101:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     105:105:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     107:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337:337 -> a
@@ -32070,17 +32242,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     113:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     115:115:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346:346 -> a
@@ -32089,17 +32261,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     131:131:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     133:133:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     135:135:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356:356 -> a
@@ -32108,12 +32280,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     142:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     144:144:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32122,22 +32294,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     152:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     154:154:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     156:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32146,39 +32318,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     164:164:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     166:166:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     168:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     170:170:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     179:179:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     183:183:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400:400 -> a
@@ -32187,12 +32359,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     190:190:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32201,17 +32373,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     198:198:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     200:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418:418 -> a
@@ -32220,12 +32392,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     211:211:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32234,22 +32406,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     217:217:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     219:219:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     221:221:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     223:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437:437 -> a
@@ -32258,12 +32430,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     231:231:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450:450 -> a
@@ -32274,37 +32446,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     240:240:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     244:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     247:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     251:251:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     259:259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     264:264:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510:511 -> a
@@ -32313,22 +32485,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.d0.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32336,16 +32508,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32356,356 +32528,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -32713,171 +32885,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -32885,16 +33057,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -32903,162 +33075,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33066,13 +33238,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33080,161 +33252,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33242,837 +33414,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34080,18 +34252,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34099,168 +34271,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34268,418 +34440,418 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1525:1525 -> z
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1519:1536 -> z
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4815:4829 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.D.d.d0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.D.d.f0.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
@@ -34688,23 +34860,23 @@
     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.D.d.d0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.D.d.f0.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.D.d.d0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.D.d.f0.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:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
     6:6:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):38 -> a
     7:9:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     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.D.d.d0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.D.d.f0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     boolean com.android.tools.r8.utils.BitUtils.isBitInMaskSet(int,int) -> a
     1:4:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
@@ -34713,11 +34885,11 @@
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
     14:15:int com.android.tools.r8.utils.ListUtils.lastIndexMatching(java.util.List,java.util.function.Predicate):16:17 -> a
     16:17:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
+    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
     18:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
     19:20:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
     21:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory) -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
     30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -34758,15 +34930,15 @@
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
     4:4:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):21 -> c
     5:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:24 -> c
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.d0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.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.D.d.d0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.D.d.f0.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
@@ -34813,7 +34985,7 @@
     30:30:void removeMarkedInstructions(java.util.Set):95 -> a
     31:32:void removeMarkedInstructions(java.util.Set):96:97 -> a
     33:34:void finish():105:106 -> a
-    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     35:35:void finish():106 -> a
     36:36:void finish():106:106 -> a
     1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
@@ -34844,54 +35016,61 @@
     java.util.Set revisitedMethods -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):57:64 -> <init>
-    1:6:void logResults():69:74 -> a
-    7:7:void logResults():73:73 -> a
-    8:44:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):82:118 -> a
-    45:51:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):117:123 -> a
-    52:69:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):131:148 -> a
-    70:79:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):155:164 -> a
-    80:80:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    80:80:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):165 -> a
-    81:89:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):166:174 -> a
-    90:90:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    90:90:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):178 -> a
-    91:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):179:189 -> a
-    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    102:102:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):189 -> a
-    103:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):190:200 -> a
-    114:114:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    114:114:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):201 -> a
-    115:115:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203:203 -> a
-    116:116:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    116:116:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203 -> a
-    117:117:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205:205 -> 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):961:961 -> a
-    118:118:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):204 -> a
-    119:132:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):206:219 -> a
-    133:133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    133:133:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):220 -> a
-    134:140:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):221:227 -> a
-    141:141:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    141:141:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227 -> a
-    142:142:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227:227 -> a
-    143:144:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):235:236 -> a
-    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    145:145:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237 -> a
-    146:155:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237:246 -> a
-    156:156:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    156:156:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):237 -> a
-    157:168:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):250:261 -> a
-    169:177:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):260:268 -> a
-    178:178:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):263:263 -> a
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:85:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:168 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    86:86:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):169 -> a
+    87:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):170:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
+    139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    139:139:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):224 -> a
+    140:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):225:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:150:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:240 -> a
+    151:151:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    151:151:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    152:161:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:250 -> a
+    162:162:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    162:162:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    163:174:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):254:265 -> a
+    175:183:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    184:184:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.D.e.e:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
-    1:5:void <clinit>():47:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):46:46 -> <init>
+    1:5:void <clinit>():48:52 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.D.e.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -34913,14 +35092,14 @@
     55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286:292 -> a
     55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
+    62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
     62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):292 -> a
     62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293:322 -> a
     63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
     93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
     93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
@@ -34943,10 +35122,10 @@
     110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
     111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
     128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
-    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
     191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
@@ -35067,7 +35246,7 @@
     553:553:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1772 -> a
     554:556:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1774:1776 -> a
     557:570:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1930:1943 -> a
-    571:571:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    571:571:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     571:571:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1948 -> a
     572:589:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1949:1966 -> a
     590:590:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1965:1965 -> a
@@ -35141,146 +35320,145 @@
     925:939: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):3361:3375 -> a
     940:965:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3549:3574 -> a
     966:970:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3585:3589 -> a
-    971:971:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3746 -> a
-    972:972:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    972:972:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3750 -> a
-    973:985:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3751:3763 -> a
-    986:986:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    986:986:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763 -> a
-    987:995:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763:3771 -> a
-    996:996:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    996:996:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772 -> a
-    997:1004:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772:3779 -> a
-    1005:1027:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3790:3812 -> a
-    1028:1028: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
-    1028:1028:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3812 -> a
-    1029:1029:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3813:3813 -> a
-    1030:1064:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3850:3884 -> a
-    1030:1064:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3817 -> a
-    1065:1071:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3818:3824 -> a
-    1072:1072:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    1072:1072:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3825 -> a
-    1073:1087:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3826:3840 -> a
-    1088:1088:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    1088:1088:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3840 -> a
-    1089:1093:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3895:3899 -> a
-    1094:1094: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
-    1094:1094:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3899 -> a
-    1095:1099:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3900:3904 -> a
-    1100:1100:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3957:3957 -> a
-    1101:1110:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3963:3972 -> a
-    1101:1110:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1111:1111:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1111:1111:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1112:1112:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1112:1112:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969 -> a
-    1112:1112:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1113:1113:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1113:1113:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1114:1115: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):3978:3979 -> a
-    1116:1116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1116:1116: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):3980 -> a
-    1117:1117: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):3982:3982 -> a
-    1118:1118:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1118:1118: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):3982 -> a
-    1119:1120: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):3982:3983 -> a
-    1121:1130:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3993:4002 -> a
-    1131:1131:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1131:1131:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4003 -> a
-    1132:1132:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4004:4004 -> a
-    1133:1133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    1133:1133:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4005 -> a
-    1134:1135:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4008:4009 -> a
-    1136:1136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    1136:1136:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4009 -> a
-    1137:1137:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4010:4010 -> a
-    1138:1138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    1138:1138:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4010 -> a
-    1139:1139:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4013:4013 -> a
-    1140:1140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    1140:1140:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4013 -> a
-    1141:1141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1141:1141:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4012 -> a
-    1142:1143:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4015:4016 -> a
-    1144:1144:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    1144:1144:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4016 -> a
-    1145:1145:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017:4017 -> a
-    1146:1146:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    1146:1146:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017 -> a
-    1147:1147:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4019:4019 -> a
-    1148:1148:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
-    1148:1148:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021 -> a
-    1149:1149:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021:4021 -> a
-    1150:1150:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1150:1150:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4019 -> a
-    1151:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4023:4024 -> a
-    1153:1153:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1153:1153:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4024 -> a
-    1154:1155:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4026:4027 -> a
-    1156:1156:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1156:1156:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4027 -> a
-    1157:1165:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029:4037 -> a
-    1166:1166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1166:1166:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4037 -> a
-    1167:1186:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4038:4057 -> a
-    1187:1190: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):1321:1324 -> a
-    1187:1190:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4057 -> a
-    1191:1210:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4058:4077 -> a
-    1211:1211:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1211:1211:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4077 -> a
-    1212:1214:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4078:4080 -> a
-    1215:1215:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1215:1215:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4080 -> a
-    1216:1217:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081:4082 -> a
-    1218:1218:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1218:1218:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081 -> a
-    1219:1219:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4083:4083 -> a
-    1220:1220:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1220:1220:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4083 -> a
-    1221:1224:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4086:4089 -> a
-    1225:1225:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1225:1225:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4089 -> a
-    1226:1226:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4091:4091 -> a
-    1227:1227:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    1227:1227:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4091 -> a
-    1228:1228:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4096:4096 -> a
-    1229:1236:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4100:4107 -> a
-    1237:1247:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4120:4130 -> a
-    1237:1247:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1248:1248:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108:4108 -> a
-    1249:1274:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4153:4178 -> a
-    1249:1274:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108 -> a
-    1275:1279:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4109:4113 -> a
-    1280:1280:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1281:1281:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1282:1282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1282:1282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1282:1282:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1283:1283:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1284:1284:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1284:1284:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1285:1285:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1285:1285:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1285:1285:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1286:1286:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1286:1286:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1286:1286:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1286:1286:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1287:1287:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1287:1287:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1288:1288:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1288:1288:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1289:1289:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1289:1289:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1289:1289:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1290:1290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1290:1290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1290:1290:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1290:1290:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1291:1291:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1291:1291:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1292:1298:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4134:4140 -> a
+    971:991:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3766 -> a
+    992:992:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    992:992:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766 -> a
+    993:1009:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766:3782 -> a
+    1010:1010:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    1010:1010:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3781 -> a
+    1011:1011:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1011:1011:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780 -> a
+    1012:1023:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780:3791 -> a
+    1024:1046:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3802:3824 -> a
+    1047:1047: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
+    1047:1047:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3824 -> a
+    1048:1048:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3825:3825 -> a
+    1049:1083:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3862:3896 -> a
+    1049:1083:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3829 -> a
+    1084:1090:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3830:3836 -> a
+    1091:1091:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    1091:1091:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3837 -> a
+    1092:1106:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3838:3852 -> a
+    1107:1107:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    1107:1107:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3852 -> a
+    1108:1112:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3907:3911 -> a
+    1113:1113: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
+    1113:1113:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3911 -> a
+    1114:1118:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3912:3916 -> a
+    1119:1119:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3969:3969 -> a
+    1120:1129:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3975:3984 -> a
+    1120:1129:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1130:1130:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1130:1130:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1131:1131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1131:1131:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981 -> a
+    1131:1131:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1132:1132:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1132:1132:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1133:1134: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):3990:3991 -> a
+    1135:1135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1135:1135: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):3992 -> a
+    1136:1136: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):3994:3994 -> a
+    1137:1137:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1137:1137: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):3994 -> a
+    1138:1139: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):3994:3995 -> a
+    1140:1149:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4005:4014 -> a
+    1150:1150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1150:1150:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4015 -> a
+    1151:1151:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4016:4016 -> a
+    1152:1152:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    1152:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4017 -> a
+    1153:1154:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4020:4021 -> a
+    1155:1155:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    1155:1155:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4021 -> a
+    1156:1156:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4022:4022 -> a
+    1157:1157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    1157:1157:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4022 -> a
+    1158:1158:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4025:4025 -> a
+    1159:1159:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    1159:1159:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4025 -> a
+    1160:1160:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1160:1160:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4024 -> a
+    1161:1162:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4027:4028 -> a
+    1163:1163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    1163:1163:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4028 -> a
+    1164:1164:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029:4029 -> a
+    1165:1165:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    1165:1165:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4029 -> a
+    1166:1166:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4031:4031 -> a
+    1167:1167:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    1167:1167:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4033 -> a
+    1168:1168:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4033:4033 -> a
+    1169:1169:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1169:1169:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4031 -> a
+    1170:1171:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4035:4036 -> a
+    1172:1172:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1172:1172:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4036 -> a
+    1173:1174:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4038:4039 -> a
+    1175:1175:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1175:1175:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4039 -> a
+    1176:1184:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4041:4049 -> a
+    1185:1185:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1185:1185:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4049 -> a
+    1186:1205:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4050:4069 -> a
+    1206:1209: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):1356:1359 -> a
+    1206:1209:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4069 -> a
+    1210:1229:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4070:4089 -> a
+    1230:1230:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1230:1230:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4089 -> a
+    1231:1233:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4090:4092 -> a
+    1234:1234:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1234:1234:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4092 -> a
+    1235:1236:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093:4094 -> a
+    1237:1237:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1237:1237:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093 -> a
+    1238:1238:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4095:4095 -> a
+    1239:1239:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1239:1239:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4095 -> a
+    1240:1243:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4098:4101 -> a
+    1244:1244:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1244:1244:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4101 -> a
+    1245:1245:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4103:4103 -> a
+    1246:1246:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    1246:1246:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4103 -> a
+    1247:1247:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4108:4108 -> a
+    1248:1255:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4112:4119 -> a
+    1256:1266:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4132:4142 -> a
+    1256:1266:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1267:1267:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120:4120 -> a
+    1268:1293:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4165:4190 -> a
+    1268:1293:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120 -> a
+    1294:1298:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4121:4125 -> a
+    1299:1299:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1300:1300:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1300:1300:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1301:1301:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1301:1301:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1301:1301:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1302:1302:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1303:1303:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1303:1303:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1304:1304:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1304:1304:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1305:1305:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1305:1305:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1305:1305:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1305:1305:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1306:1306:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1306:1306:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1307:1307:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1307:1307:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1308:1308:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1308:1308:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1308:1308:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1309:1309:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1309:1309:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1309:1309:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1309:1309:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1310:1310:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1310:1310:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1311:1317:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4146:4152 -> a
     1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):316:317 -> b
     3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356:365 -> b
     13:13:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1098:1098 -> b
@@ -35293,7 +35471,7 @@
     87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
     87:87:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3425 -> b
     88:94:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3426:3432 -> b
-    95:96:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> b
+    95:96:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> b
     95:96:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3432 -> b
     97:98:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3433:3434 -> b
     99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
@@ -35305,9 +35483,9 @@
     104:104:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
     104:104:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3405 -> b
     105:106:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3443:3444 -> b
-    107:107:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4002:4002 -> b
-    108:110:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4243 -> b
-    111:111:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4241 -> b
+    107:107:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4014:4014 -> b
+    108:110:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4255 -> b
+    111:111:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4253 -> b
     1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1307:1323 -> c
     18:94:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1369:1445 -> c
     18:94:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1323 -> c
@@ -35342,13 +35520,13 @@
     206:206:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3256:3256 -> c
     207:226:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3255:3274 -> c
     1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):183:183 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> d
     2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):185 -> d
     3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):187:209 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> d
     26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):221 -> d
     27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):224:225 -> d
-    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> d
+    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
     29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225 -> d
     30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225:228 -> d
     1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1065:1070 -> e
@@ -35365,10 +35543,10 @@
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
     77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
     1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1978:2004 -> f
-    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> f
+    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
     28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2004 -> f
     29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2005:2005 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> f
     30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2006 -> f
     31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2008:2013 -> f
     37:50:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2042:2055 -> f
@@ -35378,7 +35556,7 @@
     51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     52:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2056:2058 -> f
     52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> f
+    55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
     55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2058 -> f
     55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     56:63:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2059:2066 -> f
@@ -35395,7 +35573,7 @@
     95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2014:2036 -> f
     1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3640:3640 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> g
     2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3644 -> g
     3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3645:3660 -> g
     19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> g
@@ -35404,7 +35582,7 @@
     62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> g
     62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3660 -> g
     63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3707:3707 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> h
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> h
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3711 -> h
     2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3712:3723 -> h
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> h
@@ -35414,7 +35592,7 @@
     30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3723 -> h
     31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3742:3742 -> h
     1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791:1791 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> i
     2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791 -> i
     3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1794:1805 -> i
     15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
@@ -35427,7 +35605,7 @@
     77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> i
     77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1873 -> i
     78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1874:1880 -> i
-    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> i
+    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
     85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880 -> i
     86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880:1882 -> i
     1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):859:868 -> j
@@ -35502,17 +35680,17 @@
     41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
     41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):303 -> k
     42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):312:312 -> k
-    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3914:3918 -> l
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3926:3930 -> l
     6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3919 -> l
-    7:26:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3920:3939 -> l
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3931 -> l
+    7:26:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3932:3951 -> l
     27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
-    27:27:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3940 -> l
+    27:27:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3952 -> l
     28:28:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object) -> l
-    28:28:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3941 -> l
+    28:28:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3953 -> l
     29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    29:29:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3944 -> l
-    30:38:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3945:3953 -> l
+    29:29:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3956 -> l
+    30:38:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3957:3965 -> l
     1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2353:2407 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
@@ -35521,7 +35699,7 @@
     58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2409:2411 -> m
     61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2396:2422 -> m
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652:2652 -> n
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> n
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652 -> n
     3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2655:2661 -> n
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
@@ -35589,7 +35767,7 @@
     66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3481:3515 -> p
     67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> p
     102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3516 -> p
     102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3518:3539 -> p
@@ -35621,7 +35799,7 @@
     207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
     207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3122 -> p
     208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3128:3130 -> p
-    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> p
+    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
     211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130 -> p
     212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130:3132 -> p
     1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2209:2211 -> q
@@ -35648,12 +35826,12 @@
     26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
     26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2274 -> r
     27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2262:2280 -> r
-    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4240:4274 -> s
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4252:4286 -> s
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4274 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4286 -> s
     37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4275 -> s
-    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4278:4285 -> s
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4287 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4290:4297 -> s
     1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1117:1131 -> t
     16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):371:389 -> t
     16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1132 -> t
@@ -35716,7 +35894,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):548:548 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):558:558 -> a
     4:15:com.android.tools.r8.ir.code.BasicBlock build():563:574 -> a
-    16:19: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):1321:1324 -> a
+    16:19: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):1356:1359 -> a
     16:19:com.android.tools.r8.ir.code.BasicBlock build():574 -> a
     20:22:com.android.tools.r8.ir.code.BasicBlock build():576:578 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):553:553 -> b
@@ -35775,11 +35953,11 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():4185:4185 -> <clinit>
-    1:8:void <init>():4185:4192 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4185:4185 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4195:4197 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):4201:4233 -> b
+    1:1:void <clinit>():4197:4197 -> <clinit>
+    1:8:void <init>():4197:4204 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4197:4197 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4207:4209 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):4213:4245 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
@@ -35790,7 +35968,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):485:485 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
     4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):496:517 -> 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):1351:1354 -> 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):1386:1389 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):517 -> a
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):518:519 -> 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):508:508 -> a
@@ -35883,142 +36061,96 @@
     40:59:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):122:141 -> b
 com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
+    boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.IRCode code -> d
-    int inliningInstructionLimit -> h
+    int instructionAllowance -> h
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
-    int instructionAllowance -> i
+    int inliningInstructionLimit -> g
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
-    com.android.tools.r8.ir.optimize.InliningInfo info -> g
     java.util.function.Predicate isProcessedConcurrently -> f
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):59:68 -> <init>
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):65:73 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    1:14:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):79:92 -> a
-    15:15:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    15:15:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):93 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):83:83 -> a
-    17:17:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):84 -> a
-    18:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):101:124 -> a
+    boolean isForcedInliningOracle() -> a
+    1:15:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):89:103 -> a
+    16:16:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):86:86 -> a
+    17:40:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):111:134 -> a
+    41:41:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):118 -> a
     42:42:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):108 -> a
-    43:43:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    43:43:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    44:45:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):104:105 -> a
-    46:61:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):139:154 -> a
-    62:82: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):150:170 -> a
-    83:83:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    83:83: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):170 -> a
-    84:84: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):152:152 -> a
-    85:92:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):181:188 -> a
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    93:93:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188 -> a
-    94:103:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188:197 -> a
-    104:104:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    104:104:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):198 -> a
-    105:106:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):208:209 -> a
-    107:107:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    107:107:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):210 -> a
-    108:122:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):215:229 -> a
-    123:123:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    123:123:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):230 -> a
-    124:129:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235:240 -> a
-    130:130:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    130:130:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):241 -> a
-    131:137:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):246:252 -> a
-    138:138:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    138:138:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):253 -> a
-    139:148:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):258:267 -> a
-    149:149:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    149:149:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):268 -> a
-    150:160:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):273:283 -> a
-    161:163:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):282:284 -> a
-    164:164:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    164:164:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):285 -> a
-    165:165:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    166:177:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):315:326 -> a
-    166:177:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):299 -> a
-    178:185:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):300:307 -> a
-    186:186:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):304:304 -> a
-    187:195:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):338:346 -> a
-    196:196:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    196:196:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):347 -> a
-    197:202:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):352:357 -> a
-    203:203:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    203:203:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):357 -> a
-    204:205:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):360:361 -> a
-    206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    206:206:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):361 -> a
-    207:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):365:367 -> a
-    210:210:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    210:210:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):367 -> a
-    211:211:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368:368 -> a
-    212:212:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    212:212:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368 -> a
-    213:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368:380 -> a
-    226:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):379:388 -> a
-    236:242:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):384:390 -> a
-    243:252:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):402:411 -> a
-    253:253:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    253:253:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    254:254:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    254:254:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    254:254:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    255:255:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    255:255:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    256:257:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):418:419 -> a
-    258:258:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    258:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    259:259:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    259:259:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    259:259:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    260:260:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    260:260:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    261:265:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):425:429 -> a
-    266:266:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    266:266:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    267:267:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    267:267:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    268:268:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):432:432 -> a
-    269:269:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):439:439 -> a
-    270:270:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    270:270:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    271:271:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokePolymorphic.getType():51:51 -> a
-    271:271:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    271:271:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    272:272:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    272:272:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    273:275:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):448:450 -> a
-    276:276:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    276:276:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):450 -> a
-    277:277:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
-    278:278:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):460:460 -> a
-    279:289:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:675 -> a
-    279:289:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    290:290:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    290:290:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):684 -> a
-    290:290:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    291:329:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):685:723 -> a
-    291:329:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    330:330:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    330:330:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):684 -> a
-    330:330:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    331:331:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:665 -> a
-    331:331:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    332:332:boolean stillHasBudget():466:466 -> a
-    333:333:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471:471 -> a
-    334:334:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    334:334:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    335:370:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):475:510 -> a
-    371:371:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    371:371:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    372:372:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):516:516 -> a
-    373:397:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):522:546 -> a
-    398:405:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):558:565 -> a
-    1:2:void finish():73:74 -> b
-    3:4:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> b
+    42:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):113 -> a
+    43:44:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
+    45: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):150:165 -> a
+    61:81: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):161:181 -> a
+    82:82:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    82:82: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):181 -> a
+    83:83: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):185:185 -> a
+    84:84:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    84:84: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):181 -> a
+    85:85: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):163:163 -> a
+    86:94: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):200:208 -> a
+    95:95:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    95:95: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):208 -> a
+    96: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):208:296 -> a
+    185:187: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):295:297 -> a
+    188:188:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
+    189:200:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:329 -> a
+    189:200:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):310 -> a
+    201:201:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    202:202:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):340:340 -> a
+    203:213:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):349:359 -> a
+    214:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):358:368 -> a
+    225:225:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    225:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):368 -> a
+    226:231:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370:375 -> a
+    232:232:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    232:232:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):375 -> a
+    233:233:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376:376 -> a
+    234:234:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    234:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376 -> a
+    235:246:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376:387 -> a
+    247:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):400:411 -> a
+    259:274:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:425 -> a
+    275:277:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):431:433 -> a
+    278:278:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    278:278:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):433 -> a
+    279:279:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):435:435 -> a
+    280:311:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):453:484 -> a
+    312:312:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    312:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484 -> a
+    313:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):487:492 -> a
+    319:319:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    319:319:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484 -> a
+    320:338:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):495:513 -> a
+    339:339:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    339:339:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):514 -> a
+    340:341:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):516:517 -> a
+    342:342:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    342:342:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):514 -> a
+    343:351:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):523:531 -> a
+    352:352:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    352:352:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):532 -> a
+    353:355:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:536 -> a
+    356:356:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    356:356:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):532 -> a
+    357:357:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:544 -> a
+    358:358:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551:551 -> a
+    359:359:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    359:359:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    360:362:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):554:556 -> a
+    363:363:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    363:363:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    364:364:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566:566 -> a
+    365:365:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    365:365:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    366:406:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):570:610 -> a
+    407:407:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    407:407:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    408:408:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):621:621 -> a
+    409:433:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):627:651 -> a
+    434:441:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):663:670 -> a
+    1:2:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):191:192 -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.x:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -36035,7 +36167,7 @@
     109:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148 -> a
     110:124:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):153:167 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
     146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -36050,7 +36182,7 @@
     153:153:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):202 -> a
     154:164:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):205:215 -> a
     165:176:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):214:225 -> a
-    177:177:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    177:177:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     177:177:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225 -> a
     178:180: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.D.e.y:
@@ -36077,10 +36209,10 @@
     80:80:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     80:80:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130 -> a
     80:80:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):154:169 -> a
-    1:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:149 -> b
-    10:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
-    10:12:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):149 -> b
+    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.z:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36091,23 +36223,24 @@
     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.D.e.A:
-    java.util.Map invokesToInline -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):30:32 -> <init>
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
+    java.util.Map invokesToInline -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):35:38 -> <init>
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):42:42 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):50:50 -> a
-    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):105:108 -> a
-    void finish() -> b
-    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):54:64 -> b
+    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):48:52 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):61:61 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):71:71 -> a
+    8:11:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):124:127 -> a
+    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):75:85 -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36186,68 +36319,69 @@
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
 com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.J:
-    java.util.Set blackList -> g
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
-    java.util.Set doubleInlineCallers -> d
-    java.util.Set doubleInlineSelectedTargets -> e
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> h
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
-    java.util.Map doubleInlineeCandidates -> f
-    boolean applyDoubleInlining -> c
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):62:77 -> <init>
-    1:2:void fillInBlackList():81:82 -> a
-    3:6:boolean isBlackListed(com.android.tools.r8.graph.DexMethod):86:89 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
-    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    10:15:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):890:895 -> a
-    10:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    16:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):105:117 -> a
-    29:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):95:97 -> a
-    29:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):118 -> a
-    32:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):119:124 -> a
-    38:43:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):146:151 -> a
-    44:54:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):155:165 -> a
-    55:56:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> a
-    57:64:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:213 -> a
-    65:78:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):212:225 -> a
-    79:83:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:219 -> a
-    84:90:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:221 -> a
-    91:115:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):619:643 -> a
-    116:117:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):746:747 -> a
-    118:126:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):756:764 -> a
-    127:127:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    127:127:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):758 -> a
-    128:128:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):765:765 -> a
-    129:129:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    130:141:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):792:803 -> a
-    142:142:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    142:142:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):804 -> a
-    143:148:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):805:810 -> a
-    149:149:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    149:149:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):810 -> a
-    150:158:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:821 -> a
-    159:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819:844 -> a
-    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    185:185:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):849 -> a
-    186:187:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):850:851 -> a
-    188:197:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):905:914 -> a
-    188:197:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):857 -> a
-    198:230:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):851:883 -> a
-    231:231:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
-    231:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):884 -> a
-    232:233:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):885:886 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):130:136 -> b
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
+    java.util.Set blackList -> b
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):74:74 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):66:79 -> <init>
+    1:23:boolean isBlackListed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):84:106 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    27:32:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):861:866 -> a
+    27:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    33:45:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):126:138 -> a
+    46:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:118 -> a
+    46:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):139 -> a
+    49:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):140:145 -> a
+    55:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):167:172 -> a
+    61:71:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):176:186 -> a
+    72:73:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):191:192 -> a
+    74:81:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):227:234 -> a
+    82:95:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):233:246 -> a
+    96:100:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:240 -> a
+    101:107:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:242 -> a
+    108:132:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):640:664 -> a
+    133:134:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):689:690 -> a
+    135:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):699:707 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    144:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):701 -> a
+    145:145:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):708:708 -> a
+    146:146:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    147:158:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):735:746 -> a
+    159:159:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    159:159:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):747 -> a
+    160:190:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):748:778 -> a
+    191:198:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):849:856 -> a
+    191:198:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    199:199:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):854:854 -> a
+    199:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    200:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783:783 -> a
+    201:228:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):779:806 -> a
+    229:229:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    229:229:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):811 -> a
+    230:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):812:813 -> a
+    232:241:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):876:885 -> a
+    232:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819 -> a
+    242:271:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:842 -> a
+    272:272:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
+    272:272:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):843 -> a
+    273:274:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):844:845 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:157 -> b
     8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):188:199 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):176:182 -> c
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):209:220 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):197:203 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.D:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -36258,61 +36392,61 @@
     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>():235:251 -> <clinit>
-    18:47:void <clinit>():235:264 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):255:256 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():235:235 -> a
-    1:1:boolean isSet(int):268:268 -> b
+    1:17:void <clinit>():256:272 -> <clinit>
+    18:47:void <clinit>():256:285 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):276:277 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():256:256 -> a
+    1:1:boolean isSet(int):289:289 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():286:294 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):296:299 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):302:306 -> <init>
-    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):329:352 -> a
-    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):358:369 -> a
-    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):374:424 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):498:508 -> a
-    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> a
-    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):425:432 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):475:490 -> a
-    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> a
-    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):436:470 -> a
-    1:5:boolean equals(java.lang.Object):319:323 -> equals
-    1:4:int hashCode():311:314 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():40:40 -> hashCode
-    5:5:int hashCode():314 -> hashCode
+    1:9:void <clinit>():307:315 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):317:320 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):323:327 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):350:373 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):379:390 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):395:445 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):519:529 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):446:453 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):496:511 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> a
+    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:491 -> a
+    1:5:boolean equals(java.lang.Object):340:344 -> equals
+    1:4:int hashCode():332:335 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
+    5:5:int hashCode():335 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.F:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():533:533 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):541:544 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():548:548 -> a
-    2:37:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):557:592 -> a
+    1:1:void <clinit>():554:554 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):562:565 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():569:569 -> a
+    2:37:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):578:613 -> a
     38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):593 -> a
-    39:47:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):594:602 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):614 -> a
+    39:47:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):615:623 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.G:
     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):611:613 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.H:
     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):735:737 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.I:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():521:525 -> <clinit>
-    1:1:void <init>(java.lang.String,int):520:520 -> <init>
+    1:5:void <clinit>():542:546 -> <clinit>
+    1:1:void <init>(java.lang.String,int):541:541 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.K:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -36367,44 +36501,20 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):224:224 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> g
-com.android.tools.r8.ir.optimize.InliningInfo -> com.android.tools.r8.D.e.P:
-    java.util.List edges -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexEncodedMethod):70:73 -> <init>
-    1:1:void exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    1:4:java.lang.String toString():86:89 -> toString
-    5:9:void com.android.tools.r8.ir.optimize.InliningInfo$Edge.appendOn(java.lang.StringBuffer):29:33 -> toString
-    5:9:java.lang.String toString():90 -> toString
-    10:13:java.lang.String toString():91:94 -> toString
-com.android.tools.r8.ir.optimize.InliningInfo$Edge -> com.android.tools.r8.D.e.L:
-    com.android.tools.r8.ir.optimize.InliningInfo$Node inlinee -> b
-    com.android.tools.r8.graph.DexMethod declared -> a
-    1:4:void <init>(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.InliningInfo$Node):22:25 -> <init>
-com.android.tools.r8.ir.optimize.InliningInfo$Inlining -> com.android.tools.r8.D.e.M:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> <init>
-    1:1:void appendOn(java.lang.StringBuffer):50:50 -> a
-com.android.tools.r8.ir.optimize.InliningInfo$Node -> com.android.tools.r8.D.e.N:
-    1:1:void <init>():37:37 -> <init>
-    void appendOn(java.lang.StringBuffer) -> a
-com.android.tools.r8.ir.optimize.InliningInfo$NotInlining -> com.android.tools.r8.D.e.O:
-    java.lang.String reason -> a
-    1:2:void <init>(java.lang.String):58:59 -> <init>
-    1:2:void appendOn(java.lang.StringBuffer):64:65 -> a
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.Q:
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod) -> a
-    void finish() -> b
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.S:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.L:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,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
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.M:
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.T:
+    boolean willExceedBudget(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.D.e.N:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -36412,7 +36522,7 @@
     3:12:int doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> a
     3:12:int doHash(java.lang.Object):11 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.U:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.O:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -36441,7 +36551,7 @@
     3:3:boolean hasSeenStrictlyAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):209:209 -> 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.D.e.X:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.D.e.S:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -36520,22 +36630,22 @@
     275:291: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):392:408 -> a
     275:291:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
     292:293:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):446:447 -> a
-    294:294:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    294:294:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     294:294:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447 -> a
     295:297:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:449 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.V:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.P:
     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):64:66 -> <init>
     1:5:boolean equals(java.lang.Object):71:75 -> equals
     1:1:int hashCode():80:80 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.W:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.Q:
     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>():54:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.Y:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.T:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -36565,16 +36675,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -36610,7 +36720,7 @@
     3:3:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):76:76 -> e
     1:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):54:78 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.Z:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.U:
     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>
@@ -36618,7 +36728,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.D.e.a0:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.D.e.V:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -36652,17 +36762,17 @@
     58:58:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
     58:58:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):128 -> a
     59:60:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):128:129 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.b0:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.W:
     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():881:881 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
     37:52:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):64:79 -> a
     53:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.c0:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.X:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
@@ -36700,7 +36810,7 @@
     188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):239 -> a
     189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):240:249 -> a
-    199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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 insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249 -> a
     200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249:249 -> a
     201:261:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):303:363 -> a
@@ -36720,7 +36830,7 @@
     333:378:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):471:516 -> a
     333:378:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):450 -> a
     379:384:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):456:461 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.p0:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.k0:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -36729,39 +36839,39 @@
     java.util.Set methodsSelectedForOutlining -> b
     com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
     1:1:void <clinit>():106:106 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1262:1262 -> <init>
-    2:1157:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1264 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1273:1273 -> <init>
+    2:1168:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1275 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):106:106 -> a
-    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1275:1277 -> a
-    5:10:java.util.List selectOutlines():1369:1374 -> a
-    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1312 -> a
-    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1313:1321 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):579:579 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1322 -> a
-    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323:1332 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1332 -> a
-    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333:1341 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1341 -> a
-    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1342:1364 -> a
+    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1286:1288 -> a
+    5:10:java.util.List selectOutlines():1380:1385 -> a
+    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323 -> a
+    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1324:1332 -> a
+    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
+    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
+    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
+    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
+    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
     65:65:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
-    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1364 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
     66:66:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> a
-    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1364 -> a
-    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1381:1387 -> a
-    74:75:boolean checkAllOutlineSitesFoundAgain():1392:1393 -> a
+    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
+    74:75:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):106:106 -> b
-    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1283:1285 -> b
-    5:5:java.util.Set getMethodsSelectedForOutlining():1305:1305 -> b
+    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1294:1296 -> b
+    5:5:java.util.Set getMethodsSelectedForOutlining():1316:1316 -> b
     void noProcessing(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> c
     1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):106:106 -> c
-    2:4:java.util.function.BiConsumer identifyCandidateMethods():1272:1274 -> c
+    2:4:java.util.function.BiConsumer identifyCandidateMethods():1283:1285 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):106:106 -> d
-    2:8:boolean selectMethodsForOutlining():1290:1296 -> d
-    9:15:boolean selectMethodsForOutlining():1295:1301 -> d
+    2:8:boolean selectMethodsForOutlining():1301:1307 -> d
+    9:15:boolean selectMethodsForOutlining():1306:1312 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):106:106 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.d0:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.Y:
     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):209:210 -> <init>
     java.lang.String getDetailsString() -> a
@@ -36771,11 +36881,11 @@
     5:5:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):236 -> a
     6:11:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):238:243 -> a
     12:16:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):268:272 -> a
-    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     17:17:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):274 -> a
     18:19:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:277 -> a
     20:23:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:279 -> a
-    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     24:24:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281 -> a
     25:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281:300 -> a
     45:45:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):297:297 -> a
@@ -36789,7 +36899,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():221 -> hashCode
     2:2:int hashCode():221:221 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.e0:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.Z:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -36805,14 +36915,14 @@
     14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):433:452 -> a
     34:34:java.lang.String getDetailsString():458:458 -> a
     35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):487:489 -> a
-    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):491 -> a
     39:44:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):477:482 -> a
     39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493 -> a
     45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493:498 -> a
     51:51:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):498 -> a
-    52:52:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    52:52:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     52:52:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500 -> a
     53:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500:503 -> a
     57:57: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
@@ -36825,7 +36935,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():409 -> hashCode
     2:6:int hashCode():409:413 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.f0:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.a0:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):311:312 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):332:332 -> a
@@ -36836,7 +36946,7 @@
     6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):361:362 -> a
     8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):362 -> a
-    9:9:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    9:9:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     9:9:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364 -> a
     10:12:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364:366 -> a
     1:1:java.lang.String getInstructionName():346:346 -> b
@@ -36846,7 +36956,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():327 -> hashCode
     2:2:int hashCode():327:327 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.g0:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.b0:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -36856,36 +36966,36 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():531:531 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):548:548 -> <init>
-    2:27:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:560 -> <init>
-    28:28:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
-    1:5:com.android.tools.r8.graph.DexProto buildProto():570:574 -> a
+    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:562 -> <init>
+    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
+    1:5:com.android.tools.r8.graph.DexProto buildProto():572:576 -> a
     1:1:int compareTo(java.lang.Object):531:531 -> compareTo
-    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):627:632 -> compareTo
+    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):629:634 -> compareTo
     2:7:int compareTo(java.lang.Object):531 -> compareTo
-    8:8:int argumentCount():566:566 -> compareTo
-    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632 -> compareTo
+    8:8:int argumentCount():568:568 -> compareTo
+    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634 -> compareTo
     8:8:int compareTo(java.lang.Object):531 -> compareTo
-    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632:663 -> compareTo
+    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634:665 -> compareTo
     9:40:int compareTo(java.lang.Object):531 -> compareTo
-    1:18:boolean equals(java.lang.Object):584:601 -> equals
-    1:6:int hashCode():609:614 -> hashCode
-    1:37:java.lang.String toString():670:706 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.D.e.h0:
-    com.android.tools.r8.ir.optimize.Outliner this$0 -> c
-    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> b
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1555:1556 -> <init>
+    1:18:boolean equals(java.lang.Object):586:603 -> equals
+    1:6:int hashCode():611:616 -> hashCode
+    1:37:java.lang.String toString():672:708 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.D.e.c0:
+    com.android.tools.r8.ir.optimize.Outliner this$0 -> d
+    com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1566:1567 -> <init>
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper) -> a
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1582:1583 -> a
+    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):1593:1594 -> a
     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 -> a
-    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):1583 -> a
-    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):1583:1583 -> a
-    5:5:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1593:1593 -> a
-    1:1:boolean computeEquals(java.lang.Object):1603:1603 -> b
-    1:1:int computeHashCode():1598:1598 -> h
+    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):1594 -> a
+    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):1594:1594 -> a
+    5:5:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1604:1604 -> a
+    1:1:boolean computeEquals(java.lang.Object):1614:1614 -> b
+    1:1:int computeHashCode():1609:1609 -> h
     int estimatedSizeForInlining() -> l
     boolean isOutlineCode() -> o
-    1:1:java.lang.String toString():1588:1588 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.D.e.j0:
+    1:1:java.lang.String toString():1599:1599 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.D.e.e0:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():122:122 -> <clinit>
@@ -36897,7 +37007,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.D.e.i0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.D.e.d0:
     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
@@ -36910,66 +37020,66 @@
     8:8:void <clinit>():127:127 -> <clinit>
     1:1:void <init>(java.lang.String,int):127:127 -> <init>
     1:22:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType fromInstruction(com.android.tools.r8.ir.code.Instruction):137:158 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.k0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.f0:
     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):1137:1139 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1144:1146 -> a
-    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1150:1151 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.l0:
+    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):1148:1150 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1155:1157 -> a
+    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1161:1162 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.g0:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.optimize.Outliner this$0 -> u
     int argumentsMapIndex -> t
-    1:1:void <clinit>():1171:1171 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1180:1184 -> <init>
-    1:53:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1189:1241 -> a
+    1:1:void <clinit>():1182:1182 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1191:1195 -> <init>
+    1:53:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1252 -> a
     54:54:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    54:54:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1241 -> a
-    55:61:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1242:1248 -> a
-    62:64:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1255:1257 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.m0:
+    54:54:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
+    55:61:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
+    62:64:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.h0:
     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):1158:1159 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1164:1166 -> a
-    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1165:1165 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.D.e.n0:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1169:1170 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1175:1177 -> a
+    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1176:1176 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.D.e.i0:
     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 <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1408:1408 -> <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):1406:1410 -> <init>
+    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):1419:1419 -> <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):1417:1421 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():1415:1415 -> a
-    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1446:1446 -> a
-    3:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1460:1465 -> a
+    1:1:int instructionCount():1426:1426 -> a
+    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1457:1457 -> a
+    3:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1471:1476 -> a
     9:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    9:9:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1465 -> a
-    10:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1466:1469 -> a
-    14:14:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1475:1475 -> a
-    15:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1486:1490 -> a
-    20:20:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
-    20:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490 -> a
-    21:30:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490:1499 -> a
-    31:31:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1505:1505 -> a
-    32:32:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1511:1511 -> a
-    33:33:int getMoveExceptionRegister(int):1521:1521 -> a
+    9:9:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1476 -> a
+    10:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1477:1480 -> a
+    14:14:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1486:1486 -> a
+    15:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1497:1501 -> a
+    20:20:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
+    20:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501 -> a
+    21:30:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501:1510 -> a
+    31:31:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1516:1516 -> a
+    32:32:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1522:1522 -> a
+    33:33:int getMoveExceptionRegister(int):1532:1532 -> 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):1526:1526 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1531:1531 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1537:1537 -> d
+    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1542:1542 -> 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.D.e.o0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.j0:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -36986,51 +37096,79 @@
     java.util.List arguments -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.optimize.Outliner this$0 -> o
-    1:1:void <clinit>():714:714 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):733:733 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):719:736 -> <init>
+    1:1:void <clinit>():716:716 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):735:735 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):721:738 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline) -> a
-    1:4:java.util.List getInstructionArray():740:743 -> a
-    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):765:770 -> a
-    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):910:922 -> a
-    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):927:933 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):933 -> a
-    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):937:943 -> 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):949:981 -> a
-    72:79:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1059:1066 -> a
-    80:115:void candidate(int,int):1074:1109 -> a
-    116:126:void reset(int):1114:1124 -> a
-    1:1:void invalidateInstructionArray():748:748 -> b
-    1:5:void process():754:758 -> c
-    6:9:void processInstruction(com.android.tools.r8.ir.code.Instruction):781:784 -> c
-    6:9:void process():758 -> c
-    10:96:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):818:904 -> c
-    10:96:void processInstruction(com.android.tools.r8.ir.code.Instruction):792 -> c
-    10:96:void process():758 -> c
-    97:97:void processInstruction(com.android.tools.r8.ir.code.Instruction):796:796 -> c
-    97:97:void process():758 -> c
-    98:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):989:1013 -> c
-    98:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    98:122:void process():758 -> c
-    123:150:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1011:1038 -> c
-    123:150:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    123:150:void process():758 -> c
-    151:154:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1037:1040 -> c
-    151:154:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    151:154:void process():758 -> c
-    155:182:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1022:1049 -> c
-    155:182:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    155:182:void process():758 -> c
-    183:189:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1047:1053 -> c
-    183:189:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    183:189:void process():758 -> c
-    190:190:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1051:1051 -> c
-    190:190:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    190:190:void process():758 -> c
-    191:201:void processInstruction(com.android.tools.r8.ir.code.Instruction):801:811 -> c
-    191:201:void process():758 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.q0:
+    1:4:java.util.List getInstructionArray():742:745 -> a
+    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
+    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
+    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
+    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
+    39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
+    72:79:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1071:1078 -> a
+    80:115:void candidate(int,int):1085:1120 -> a
+    116:126:void reset(int):1125:1135 -> a
+    1:1:void invalidateInstructionArray():750:750 -> b
+    1:5:void process():756:760 -> c
+    6:16:void processInstruction(com.android.tools.r8.ir.code.Instruction):783:793 -> c
+    6:16:void process():760 -> c
+    17:103:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):826:912 -> c
+    17:103:void processInstruction(com.android.tools.r8.ir.code.Instruction):800 -> c
+    17:103:void process():760 -> c
+    104:104:void processInstruction(com.android.tools.r8.ir.code.Instruction):804:804 -> c
+    104:104:void process():760 -> c
+    105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
+    105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    105:113:void process():760 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
+    114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    114:114:void process():760 -> c
+    115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
+    115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    115:121:void process():760 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
+    122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    122:122:void process():760 -> c
+    123:131:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1017:1025 -> c
+    123:131:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    123:131:void process():760 -> c
+    132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
+    132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    132:137:void process():760 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
+    138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    138:138:void process():760 -> c
+    139:159:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1030:1050 -> c
+    139:159:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    139:159:void process():760 -> c
+    160:163:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1049:1052 -> c
+    160:163:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    160:163:void process():760 -> c
+    164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
+    164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    164:172:void process():760 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
+    173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    173:173:void process():760 -> c
+    174:179:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1056:1061 -> c
+    174:179:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    174:179:void process():760 -> c
+    180:186:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1059:1065 -> c
+    180:186:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    180:186:void process():760 -> c
+    187:187:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1063:1063 -> c
+    187:187:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    187:187:void process():760 -> c
+    188:198:void processInstruction(com.android.tools.r8.ir.code.Instruction):809:819 -> c
+    188:198:void process():760 -> c
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.l0:
     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
@@ -37066,7 +37204,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():1443:1443 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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
@@ -37078,20 +37216,20 @@
     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():1443:1443 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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():1443:1443 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     391: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():1443:1443 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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.D.e.r0:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.D.e.m0:
     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
@@ -37113,7 +37251,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.D.e.u0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.D.e.p0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -37169,15 +37307,15 @@
     173:176:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):248:251 -> a
     173:176:void run():229 -> a
     177:178:void run():231:232 -> a
-    179:179:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    179:179:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     179:179:void run():232 -> a
     180:182:void run():232:234 -> a
     183:183:boolean lambda$run$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):189:189 -> a
     184:210:void killActiveFields(com.android.tools.r8.ir.code.FieldInstruction):262:288 -> a
     211:214:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.FieldInstruction):309:312 -> a
     1:2:void killAllActiveFields():257:258 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.s0:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.t0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.n0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.o0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -37187,7 +37325,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.D.e.v0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.D.e.q0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:12:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:47 -> a
@@ -37209,7 +37347,7 @@
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     97:97:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):172:198 -> a
@@ -37226,77 +37364,98 @@
     131:131: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):358:358 -> a
     131:131:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
     132:141:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):63:72 -> a
-    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     142:142:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72 -> a
     143:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.x0:
-    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):65:65 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):66 -> a
-    3:28:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):67:92 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    29:29:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):92 -> a
-    30:55:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):93:118 -> a
-    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    56:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118 -> a
-    57:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118:120 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    60:60:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):121 -> a
-    61:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):122:125 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    65:65:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):121 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.s0:
+    com.android.tools.r8.graph.AppView appView -> c
+    java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
+    com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
+    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
+    4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
+    31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
+    58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
+    62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
     66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    66:66:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):118 -> a
-    67:84:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):131:148 -> a
-    85:85:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    85:85:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):92 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.w0:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> d
-    com.android.tools.r8.ir.code.MemberType memberType -> f
-    com.android.tools.r8.ir.code.Value valueArray -> g
-    int index -> h
-    com.android.tools.r8.ir.code.IRCode code -> c
-    com.android.tools.r8.ir.code.InstructionListIterator iterator -> e
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):200:200 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):194:205 -> <init>
+    66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
+    68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
+    88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
+    103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
+    104:124:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    125:125:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    126:126:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
+    127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
+    139:146:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    147:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):46:54 -> a
+    147:155:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    147:155:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    156:171:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):51:66 -> a
+    156:171:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    156:171:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    172:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):64:64 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    173:195:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):57:79 -> a
+    173:195:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    173:195:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    196:196:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    196:196:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    196:196:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    197:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):72:98 -> a
+    197:223:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    197:223:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):96:96 -> a
+    224:224:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    224:224:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    225:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):86:111 -> a
+    225:250:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    225:250:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    251:252:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
+    251:252:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    253:253:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
+    255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.r0:
+    com.android.tools.r8.ir.code.IRCode code -> a
+    com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
+    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):260:263 -> <init>
     boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):209:210 -> a
-    3:6:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):289:292 -> a
-    3:6:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):214 -> a
-    7:22:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):215:230 -> a
-    23:23:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    23:23:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):230 -> a
-    24:24:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231:231 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    25:25:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231 -> a
-    26:40:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231:245 -> a
-    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    41:41:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):245 -> a
-    42:42:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    42:42:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):244 -> a
-    43:54:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):246:257 -> a
-    55:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    55:55:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):256 -> a
-    56:59:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):258:261 -> a
-    60:60:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):215:215 -> a
-    61:66:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):265:270 -> a
-    67:67:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    67:67:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):270 -> a
-    68:68:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):271:271 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    69:69:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):271 -> a
-    70:72:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):272:274 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    73:73:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276 -> a
-    74:77:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276:279 -> a
-    78:78:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    78:78:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):279 -> a
-    79:84:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):280:285 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.y0:
+    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):270:270 -> a
+    2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):286:289 -> a
+    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):269 -> a
+    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):270:282 -> a
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.t0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -37334,7 +37493,7 @@
     61:61:void replaceSwitchByOptimizedSwitch(int):140:140 -> b
     61:61:boolean optimize():66 -> b
     1:12:java.util.function.IntPredicate computeSuccessorHasBecomeDeadPredicate():91:102 -> c
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.z0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.u0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -37346,15 +37505,15 @@
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):91:98 -> a
     16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> a
     17:18:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:104 -> a
-    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
-    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
     59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.A0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.B0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.v0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.w0:
     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
@@ -37362,7 +37521,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.D.e.E0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.D.e.z0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -37415,7 +37574,7 @@
     298:318:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):536:556 -> a
     298:318:void rewrite(com.android.tools.r8.ir.code.IRCode):415 -> a
     319:320:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
-    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     321:321:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
     322:322:void rewrite(com.android.tools.r8.ir.code.IRCode):426:426 -> a
     323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
@@ -37438,19 +37597,19 @@
     14:14: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
     15:18: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
     19:29: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.D.e.C0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.D.e.x0:
     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.D.e.D0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.D.e.y0:
     boolean $assertionsDisabled -> l
     java.util.Map removedArgumentsInfoPerMethod -> k
     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 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.K0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.F0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -37492,14 +37651,14 @@
     1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> c
     19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.F0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.G0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.A0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.B0:
     java.util.BitSet used -> a
     1:3:void <init>():347:349 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
     1:1:java.util.BitSet getUsedArguments():352:352 -> a
     2:2:boolean register(int):357:357 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.H0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.C0:
     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>
@@ -37509,11 +37668,11 @@
     6:14:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):196:204 -> a
     15:17: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
     18:18: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.D.e.I0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.D.e.D0:
     java.util.Map removedArguments -> k
     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 -> f
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.J0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.E0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -37537,7 +37696,7 @@
     24:24: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
     25:25: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
     26:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174:174 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.L0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.G0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -37563,19 +37722,19 @@
     31:31:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):265:266 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
-    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     34:34:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
     95:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
-    98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     98:98:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235 -> a
     99:120:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235:256 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.G0.a:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNKNOWN_TYPE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NON_PROGRAM_CLASS -> d
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNUSED_INSTANCE -> a
@@ -37593,7 +37752,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus PINNED_FIELD -> n
     1:20:void <clinit>():37:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.L0.c:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.G0.c:
     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
@@ -37621,13 +37780,13 @@
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     46:46:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     47:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.L0.d:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.G0.d:
     int estimatedCombinedSizeForInlining -> o
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALLOWED_ZERO_TEST_TYPES -> p
     com.android.tools.r8.graph.AppView appView -> a
@@ -37645,146 +37804,147 @@
     java.util.Map methodCallsOnInstance -> l
     java.util.List unusedArguments -> n
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:3:void <clinit>():60:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):93:93 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):77:100 -> <init>
-    1:1:int getEstimatedCombinedSizeForInlining():104:104 -> a
+    1:3:void <clinit>():61:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):94:94 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):78:101 -> <init>
+    1:1:int getEstimatedCombinedSizeForInlining():105:105 -> a
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581 -> a
-    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581:581 -> a
+    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582 -> a
+    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582:582 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581 -> a
-    5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):261:290 -> a
-    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):945:957 -> a
-    35:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):291 -> a
-    48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292:329 -> a
-    86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):792:799 -> a
-    86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582 -> a
+    5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
+    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):955:967 -> a
+    35:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292 -> a
+    48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293:330 -> a
+    86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):793:800 -> a
+    86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799 -> a
-    94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799:806 -> a
-    95:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800 -> a
+    94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
+    95:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     103:103:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):806 -> a
-    103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
+    103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):799 -> a
-    104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):811:811 -> a
-    105:105:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):839:840 -> a
-    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800 -> a
+    104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):812:812 -> a
+    105:105:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840:841 -> a
+    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840 -> a
-    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841:848 -> a
-    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
+    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841 -> a
+    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):842:849 -> a
+    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840 -> a
-    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    118:129:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):818:829 -> a
-    118:129:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):339:342 -> a
-    134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):279:281 -> a
-    137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369:369 -> a
+    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):841 -> a
+    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    118:129:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:830 -> a
+    118:129:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340:343 -> a
+    134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:282 -> a
+    137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
     138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369 -> a
-    139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369:369 -> a
+    138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
     140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369 -> a
-    141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):408:414 -> a
-    141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
+    141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):414 -> a
-    148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415:420 -> a
-    149:154:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    155:159:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):424:428 -> a
-    155:159:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):372 -> a
-    160:180:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):375:395 -> a
-    181:184:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):433:436 -> a
-    181:184:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):398 -> a
-    185:185:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399:399 -> a
-    186:231:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):459:504 -> a
-    186:231:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400 -> a
-    232:248:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):510:526 -> a
-    232:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
-    249:264:void removeFieldWrites():555:570 -> a
-    249:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    265:267:void removeFieldWrites():564:566 -> a
-    265:267:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    268:270:void removeFieldWrites():557:559 -> a
-    268:270:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    271:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403:403 -> a
-    272:276:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):534:538 -> a
-    277:288:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):537:548 -> a
-    289:289:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    289:289:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548 -> a
-    290:290:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:549 -> a
+    148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
+    148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
+    149:154:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    155:159:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):425:429 -> a
+    155:159:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):373 -> a
+    160:180:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):376:396 -> a
+    181:184:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):434:437 -> a
+    181:184:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399 -> a
+    185:185:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400:400 -> a
+    186:231:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:505 -> a
+    186:231:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    232:248:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):511:527 -> a
+    232:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    249:264:void removeFieldWrites():556:571 -> a
+    249:264:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    265:267:void removeFieldWrites():565:567 -> a
+    265:267:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    268:270:void removeFieldWrites():558:560 -> a
+    268:270:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    271:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    272:276:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):535:539 -> a
+    277:288:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):538:549 -> a
+    289:289:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    289:289:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
+    290:290:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550:550 -> a
     291:291:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    291:291:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
-    292:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548:551 -> a
-    296:296:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):538:538 -> a
-    297:302:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):576:581 -> a
-    303:355:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):580:632 -> a
-    356:386:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):647:677 -> a
-    356:386:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):695 -> a
-    387:389:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):686:688 -> a
-    390:396:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:693 -> a
-    397:397:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):691:691 -> a
-    398:400:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):699:701 -> a
-    401:401:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):702:702 -> a
-    402:438:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):712:748 -> a
-    439:444:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):752:757 -> a
+    291:291:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550 -> a
+    292:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:552 -> a
+    296:296:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):539:539 -> a
+    297:302:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):577:582 -> a
+    303:355:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):581:633 -> a
+    356:386:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):648:678 -> a
+    356:386:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):696 -> a
+    387:389:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:689 -> a
+    390:396:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):688:694 -> a
+    397:397:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):692:692 -> a
+    398:400:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):700:702 -> a
+    401:401:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703:703 -> a
+    402:438:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):713:749 -> a
+    439:444:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):753:758 -> a
     445:445:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    445:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757 -> a
-    446:446:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757:757 -> a
+    445:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758 -> a
+    446:446:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758:758 -> a
     447:447:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    447:447:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):757 -> a
-    448:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):761:764 -> a
-    452:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):861:891 -> a
-    483:488:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):913:918 -> a
-    483:488:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):892 -> a
-    489:506:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):887:904 -> a
-    507:507:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):903:903 -> a
-    508:520:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):964:976 -> a
-    521:521:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):990:990 -> a
-    522:523:void removeInstruction(com.android.tools.r8.ir.code.Instruction):990:991 -> a
-    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():147:249 -> b
-    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():233:233 -> b
+    447:447:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):758 -> a
+    448:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):762:765 -> a
+    452:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):862:892 -> a
+    483:488:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):923:928 -> a
+    483:488:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):893 -> a
+    489:515:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):888:914 -> a
+    516:516:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):909:909 -> a
+    517:530:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):974:987 -> a
+    531:531:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):986:986 -> a
+    532:532:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1001:1001 -> a
+    533:534:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1001:1002 -> a
+    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
+    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
     105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
-    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688 -> b
-    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688:688 -> b
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689 -> b
+    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689:689 -> b
     107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
-    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688 -> b
-    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):922:935 -> b
-    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
+    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689 -> b
+    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):932:945 -> b
+    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
     122:122:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):935 -> b
-    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
-    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):940:940 -> b
-    1:22:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():110:131 -> c
-    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():441:453 -> d
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.a:
+    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):945 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
+    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):950:950 -> b
+    1:22:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():111:132 -> c
+    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():442:454 -> d
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.a:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo asMutableCallSiteOptimizationInfo() -> a
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int) -> a
     boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod) -> a
     boolean isDefaultCallSiteOptimizationInfo() -> b
     boolean isMutableCallSiteOptimizationInfo() -> c
-com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.b:
+com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int) -> a
     boolean isDefaultCallSiteOptimizationInfo() -> b
     1:1:com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo getInstance():16:16 -> d
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.M0.c:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.H0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -37795,7 +37955,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():21:21 -> g
     boolean valueHasBeenPropagated() -> h
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():16:16 -> i
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.M0.d:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.H0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
     boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> k
@@ -37859,7 +38019,7 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     1:1:boolean mayHaveSideEffects():201:201 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():77:77 -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.M0.e:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.H0.e:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -37869,7 +38029,7 @@
     boolean isMutableFieldOptimizationInfo() -> f
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> g
     boolean valueHasBeenPropagated() -> h
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.M0.g:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.H0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
     java.util.Set getInitializedClassesOnNormalExit() -> C
@@ -37903,13 +38063,13 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     boolean mayHaveSideEffects() -> y
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.M0.f:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.H0.f:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
     1:3:void <clinit>():20:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.M0.k:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.H0.k:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
     boolean $assertionsDisabled -> d
@@ -37943,8 +38103,8 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection lambda$computeCachedRepresentativeIfNecessary$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection,com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection):125:125 -> b
     boolean isMutableCallSiteOptimizationInfo() -> c
     1:11:java.lang.String toString():227:237 -> toString
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.M0.h:
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.M0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.H0.h:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.H0.j:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement[] dynamicTypes -> a
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection BOTTOM -> b
     boolean $assertionsDisabled -> c
@@ -37962,11 +38122,11 @@
     9:9:boolean equals(java.lang.Object):94:94 -> equals
     1:1:int hashCode():101:101 -> hashCode
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.M0.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.H0.i:
     1:1:void <init>():35:35 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int):38:38 -> a
     1:1:int hashCode():43:43 -> hashCode
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.M0.l:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.H0.l:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
@@ -37990,7 +38150,7 @@
     1:1:boolean valueHasBeenPropagated():71:71 -> h
     1:1:void markAsPropagated():75:75 -> i
     1:1:void markCannotBeKept():57:57 -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.M0.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.H0.n:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -38030,10 +38190,10 @@
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.M0.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.H0.m:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.M0.o:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.H0.o:
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
@@ -38075,7 +38235,7 @@
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> i
     1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> j
     1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):47:52 -> k
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.M0.q:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.H0.q:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38108,9 +38268,9 @@
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.M0.p:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.H0.p:
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.M0.r:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.H0.r:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38145,7 +38305,7 @@
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
     1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> j
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.M0.u:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.H0.u:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -38153,7 +38313,7 @@
     6:6:void <init>(java.util.List):34:34 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):35:35 -> a
     2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):39:40 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.M0.s:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.H0.s:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -38163,7 +38323,7 @@
     boolean hasFieldAssignment -> d
     1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):72:81 -> <init>
     1:1:boolean notUsed():85:85 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.M0.t:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.H0.t:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -38197,7 +38357,7 @@
     32:33:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
     32:33:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
     34:34:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.M0.v:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.H0.v:
     boolean returnsConstantNumber -> i
     boolean returnsConstantString -> k
     boolean initializerEnablingJavaAssertions -> u
@@ -38290,7 +38450,56 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     1:1:boolean mayHaveSideEffects():289:289 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():161:161 -> z
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.N0.a:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.a:
+    com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():19:19 -> e
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.b:
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):20:24 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):29:43 -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.I0.c:
+    com.android.tools.r8.graph.DexEncodedMethod callee -> a
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    java.io.PrintStream output -> c
+    boolean reasonHasBeenReported -> d
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:22 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):19:25 -> <init>
+    1:11:void print(java.lang.String):29:39 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):44:44 -> a
+    13:13:void reportInstructionBudgetIsExceeded():49:49 -> a
+    14:14:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):55:55 -> a
+    15:19:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:79 -> a
+    20:20:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:75 -> a
+    21:23:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:87 -> a
+    24:24:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:85 -> a
+    25:25:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    1:1:void reportUnknownReason():65:65 -> b
+    2:2:void reportWillExceedInstructionBudget(int,int):98:98 -> b
+    1:1:void reportUnknownTarget():70:70 -> c
+    1:1:boolean verifyReasonHasBeenReported():107:107 -> d
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.J0.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
@@ -38311,7 +38520,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.D.e.N0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.J0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
@@ -38355,7 +38564,7 @@
     81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
     81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
     1:5:void processCode():172:176 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.N0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.J0.b:
     1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
@@ -38367,7 +38576,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.D.e.N0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.D.e.J0.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
@@ -38378,7 +38587,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.D.e.N0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.D.e.J0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -38403,7 +38612,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -38416,14 +38625,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):139:140 -> e
     1:1:boolean isTrivial():130:130 -> f
     1:1:int size():72:72 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.N0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.J0.e:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):56:58 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.N0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.J0.f:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):218:219 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.N0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -38443,9 +38652,9 @@
     22:22:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
     23:23:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):52:52 -> k
     23:23:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.N0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.J0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.N0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.J0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -38458,114 +38667,111 @@
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
     java.util.function.BiFunction strategyFactory -> i
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):124:124 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):90:132 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> a
-    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):147:147 -> a
-    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):160:193 -> a
-    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):161:161 -> a
-    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):168:168 -> a
-    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:205 -> a
-    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):216:225 -> a
-    52:72:java.util.Map finalizeLambdaGroups():314:334 -> a
-    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):229 -> a
-    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):232:265 -> a
-    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):264:278 -> a
-    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):233:233 -> a
-    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
-    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):267:267 -> a
-    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):269:271 -> a
-    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):283:287 -> a
-    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):291:310 -> a
-    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):296:296 -> a
-    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):298:303 -> a
-    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):301:306 -> a
-    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> a
-    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):306 -> a
-    168:174:void removeTrivialLambdaGroups():340:346 -> a
-    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):354:364 -> a
-    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):363:376 -> a
-    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:370 -> a
-    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:372 -> a
-    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380:381 -> a
-    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    52:72:java.util.Map finalizeLambdaGroups():313:333 -> a
+    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    168:174:void removeTrivialLambdaGroups():339:345 -> a
+    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     214:215:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):382:404 -> a
-    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     239:239:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:410 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):87 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> b
-    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):164:166 -> b
+    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408:409 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166 -> b
-    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166:167 -> b
-    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):172:184 -> b
-    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):179:179 -> b
-    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):193:193 -> b
-    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):346:346 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):359:359 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> c
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):143:143 -> c
-    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):151:151 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> d
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):134:134 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.N0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.N0.k:
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> c
+    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> d
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.J0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.J0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):413:413 -> <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):414:418 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415:415 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):417:417 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):425:425 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):430:430 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):435:435 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):440:440 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):445:445 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):450:450 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.N0.l:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.J0.l:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
     java.util.Set typeAffectedValues -> m
-    1:1:void <clinit>():454:454 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):454:454 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):465:467 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:464 -> <init>
-    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):458:470 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):466:466 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):474:476 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):538:538 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):543:543 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):550:550 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):555:555 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):562:562 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):567:567 -> a
-    1:28:void processCode():483:510 -> b
-    29:48:void processCode():509:528 -> b
-    49:49:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> b
-    49:49:void processCode():528 -> b
-    50:51:void processCode():528:529 -> b
-    52:52:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):533:533 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.N0.m:
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.J0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():571:571 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):576:577 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):594:598 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):604:610 -> a
-    1:1:java.lang.Object apply(java.lang.Object):571:571 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):582:586 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):571 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.N0.o:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.J0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -38603,7 +38809,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -38616,35 +38822,35 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> c
     1:3:void prepareInstructions():35:37 -> h
     4:35:void prepareInstructions():36:67 -> h
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.N0.p.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.N0.p.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.N0.p.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.N0.p.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.N0.p.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38691,29 +38897,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.N0.p.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.N0.p.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.N0.p.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.N0.p.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.N0.p.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -38722,7 +38928,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38776,7 +38982,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.N0.p.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -38785,96 +38991,96 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> b
     1:17:void prepareInstructions():32:48 -> h
     void prepareSuperConstructorCall(int) -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.N0.p.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.J0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):57:60 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):59:62 -> <init>
     int getInstanceInitializerSize(java.util.List) -> a
     int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int) -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):65:65 -> a
-    1:1:void accept(java.lang.Object):45:45 -> accept
-    2:2:void accept(com.android.tools.r8.graph.DexClass):70:70 -> accept
-    2:2:void accept(java.lang.Object):45 -> accept
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):67:67 -> a
+    1:1:void accept(java.lang.Object):47:47 -> accept
+    2:2:void accept(com.android.tools.r8.graph.DexClass):72:72 -> accept
+    2:2:void accept(java.lang.Object):47 -> accept
     3:3:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> accept
-    3:3:void accept(com.android.tools.r8.graph.DexClass):70 -> accept
-    3:3:void accept(java.lang.Object):45 -> accept
-    4:22:void accept(com.android.tools.r8.graph.DexClass):70:88 -> accept
-    4:22:void accept(java.lang.Object):45 -> accept
-    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):220:231 -> accept
-    23:34:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    23:34:void accept(java.lang.Object):45 -> accept
-    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):250:252 -> accept
-    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):231 -> accept
-    35:37:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    35:37:void accept(java.lang.Object):45 -> accept
-    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):234:235 -> accept
-    38:39:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    38:39:void accept(java.lang.Object):45 -> accept
-    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):244:244 -> accept
-    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):235 -> accept
-    40:40:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    40:40:void accept(java.lang.Object):45 -> accept
-    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):238:239 -> accept
-    41:42:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    41:42:void accept(java.lang.Object):45 -> accept
-    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236:236 -> accept
-    43:43:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    43:43:void accept(java.lang.Object):45 -> accept
-    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
-    44:44:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    44:44:void accept(java.lang.Object):45 -> accept
-    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):227:227 -> accept
-    45:45:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    45:45:void accept(java.lang.Object):45 -> accept
-    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):223:223 -> accept
-    46:46:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    46:46:void accept(java.lang.Object):45 -> accept
-    47:47:void accept(com.android.tools.r8.graph.DexClass):86:86 -> accept
-    47:47:void accept(java.lang.Object):45 -> accept
-    48:61:void accept(com.android.tools.r8.graph.DexClass):83:96 -> accept
-    48:61:void accept(java.lang.Object):45 -> accept
-    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):129:133 -> accept
-    62:66:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    62:66:void accept(java.lang.Object):45 -> accept
-    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):149:211 -> accept
-    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    67:129:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    67:129:void accept(java.lang.Object):45 -> accept
-    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):152:206 -> accept
-    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    130:184:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    130:184:void accept(java.lang.Object):45 -> accept
-    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int) -> accept
-    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    185:197:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    185:197:void accept(java.lang.Object):45 -> accept
-    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):176:179 -> accept
-    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    198:201:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    198:201:void accept(java.lang.Object):45 -> accept
-    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):160:163 -> accept
-    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    202:205:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    202:205:void accept(java.lang.Object):45 -> accept
-    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):142:143 -> accept
-    206:207:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    206:207:void accept(java.lang.Object):45 -> accept
-    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:134 -> accept
-    208:208:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    208:208:void accept(java.lang.Object):45 -> accept
-    209:228:void accept(com.android.tools.r8.graph.DexClass):94:113 -> accept
-    209:228:void accept(java.lang.Object):45 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> accept
-    229:229:void accept(com.android.tools.r8.graph.DexClass):112 -> accept
-    229:229:void accept(java.lang.Object):45 -> accept
-    230:232:void accept(com.android.tools.r8.graph.DexClass):114:116 -> accept
-    230:232:void accept(java.lang.Object):45 -> accept
-    233:233:void accept(com.android.tools.r8.graph.DexClass):71:71 -> accept
-    233:233:void accept(java.lang.Object):45 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.N0.p.r:
+    3:3:void accept(com.android.tools.r8.graph.DexClass):72 -> accept
+    3:3:void accept(java.lang.Object):47 -> accept
+    4:22:void accept(com.android.tools.r8.graph.DexClass):72:90 -> accept
+    4:22:void accept(java.lang.Object):47 -> accept
+    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):225:236 -> accept
+    23:34:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    23:34:void accept(java.lang.Object):47 -> accept
+    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):255:257 -> accept
+    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236 -> accept
+    35:37:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    35:37:void accept(java.lang.Object):47 -> accept
+    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):239:240 -> accept
+    38:39:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    38:39:void accept(java.lang.Object):47 -> accept
+    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):249:249 -> accept
+    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):240 -> accept
+    40:40:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    40:40:void accept(java.lang.Object):47 -> accept
+    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):243:244 -> accept
+    41:42:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    41:42:void accept(java.lang.Object):47 -> accept
+    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):241:241 -> accept
+    43:43:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    43:43:void accept(java.lang.Object):47 -> accept
+    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):237:237 -> accept
+    44:44:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    44:44:void accept(java.lang.Object):47 -> accept
+    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
+    45:45:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    45:45:void accept(java.lang.Object):47 -> accept
+    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):228:228 -> accept
+    46:46:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    46:46:void accept(java.lang.Object):47 -> accept
+    47:47:void accept(com.android.tools.r8.graph.DexClass):88:88 -> accept
+    47:47:void accept(java.lang.Object):47 -> accept
+    48:61:void accept(com.android.tools.r8.graph.DexClass):85:98 -> accept
+    48:61:void accept(java.lang.Object):47 -> accept
+    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:138 -> accept
+    62:66:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    62:66:void accept(java.lang.Object):47 -> accept
+    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):154:216 -> accept
+    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    67:129:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    67:129:void accept(java.lang.Object):47 -> accept
+    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):157:211 -> accept
+    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    130:184:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    130:184:void accept(java.lang.Object):47 -> accept
+    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):190:202 -> accept
+    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    185:197:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    185:197:void accept(java.lang.Object):47 -> accept
+    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):181:184 -> accept
+    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    198:201:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    198:201:void accept(java.lang.Object):47 -> accept
+    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):165:168 -> accept
+    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    202:205:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    202:205:void accept(java.lang.Object):47 -> accept
+    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):147:148 -> accept
+    206:207:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    206:207:void accept(java.lang.Object):47 -> accept
+    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139:139 -> accept
+    208:208:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    208:208:void accept(java.lang.Object):47 -> accept
+    209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
+    209:228:void accept(java.lang.Object):47 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> accept
+    229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
+    229:229:void accept(java.lang.Object):47 -> accept
+    230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
+    230:234:void accept(java.lang.Object):47 -> accept
+    235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
+    235:235:void accept(java.lang.Object):47 -> accept
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.J0.p.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -38887,7 +39093,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.N0.p.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.J0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -38905,7 +39111,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -38914,7 +39120,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -38925,7 +39131,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> j
     1:1:boolean isStateless():31 -> j
     2:2:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.N0.p.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -38955,7 +39161,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.N0.p.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.J0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -38967,13 +39173,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -39027,13 +39233,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39042,7 +39248,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.N0.p.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.J0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39065,7 +39271,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.N0.p.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39158,7 +39364,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.N0.p.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.J0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -39174,7 +39380,7 @@
     1:1:void lambda$prepareInstructions$6(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> e
     1:1:void lambda$prepareInstructions$7(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> f
     1:65:void prepareInstructions():41:105 -> h
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.O0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.K0.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
@@ -39188,10 +39394,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.D.e.O0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.D.e.K0.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.D.e.O0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39202,7 +39408,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.D.e.O0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39211,10 +39417,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.D.e.O0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.D.e.K0.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.D.e.O0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39235,12 +39441,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.D.e.O0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.D.e.K0.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.D.e.O0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.D.e.K0.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
@@ -39252,7 +39458,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.D.e.O0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.D.e.K0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -39267,7 +39473,7 @@
     1:1:java.lang.Boolean lambda$test$3(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.O0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.K0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39279,14 +39485,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.D.e.O0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.D.e.K0.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.D.e.O0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.D.e.K0.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
@@ -39298,7 +39504,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.D.e.O0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.D.e.K0.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
@@ -39312,7 +39518,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.D.e.O0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.D.e.K0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39324,7 +39530,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.D.e.P0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.D.e.L0.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -39332,81 +39538,90 @@
     java.util.function.BiConsumer fixupStrategy -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():47:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
-    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:109 -> <init>
-    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:182 -> a
-    68:78:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):127:137 -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):108:108 -> <init>
+    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):59:111 -> <init>
+    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):118:184 -> a
+    68:78:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):129:139 -> a
     79:79:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    79:79:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    80:99:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):142:161 -> a
-    100:104:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):167:171 -> a
-    105:106:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):186:187 -> a
-    105:106:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
+    79:79:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
+    80:99:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:163 -> a
+    100:104:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):169:173 -> a
+    105:106:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):188:189 -> a
+    105:106:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
     107:107:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    107:107:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):190 -> a
-    107:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    108:109:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):190:191 -> a
-    108:109:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:176 -> a
-    114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:239 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244 -> a
-    136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244:253 -> a
-    146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:347 -> a
-    146:154:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    155:155:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    155:155:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):350 -> a
-    155:155:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    156:196:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):353:393 -> a
-    156:196:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    197:197:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):421:421 -> a
-    197:197:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
-    197:197:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    198:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:401 -> a
-    198:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    204:227:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):426:449 -> a
-    204:227:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):401 -> a
-    204:227:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    228:235:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):402:409 -> a
-    228:235:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    236:243:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):454:461 -> a
-    236:243:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):409 -> a
-    236:243:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    244:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):410:414 -> a
-    244:248:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    249:250:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:261 -> a
-    251:255:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):329:333 -> a
-    251:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    256:280:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:286 -> a
-    281:293:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    281:293:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    294:326:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288:320 -> a
-    327:360:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    361:362:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):541:542 -> a
-    363:366:void setFixupStrategy(java.util.function.BiConsumer):553:556 -> a
-    367:370:void cleanFixupStrategy():560:563 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.P0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.P0.b:
+    107:107:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):192 -> a
+    107:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
+    108:109:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):192:193 -> a
+    108:109:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
+    110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
+    114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
+    128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
+    136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
+    146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):341:349 -> a
+    146:154:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    155:155:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    155:155:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):352 -> a
+    155:155:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    156:196:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):355:395 -> a
+    156:196:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    197:197:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):423:423 -> a
+    197:197:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):395 -> a
+    197:197:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    198:211:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):398:411 -> a
+    198:211:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    212:219:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):458:465 -> a
+    212:219:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):411 -> a
+    212:219:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    220:224:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):412:416 -> a
+    220:224:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    225:226:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:263 -> a
+    227:231:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331:335 -> a
+    227:231:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):263 -> a
+    232:256:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264:288 -> a
+    257:269:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):472:484 -> a
+    257:269:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288 -> a
+    270:302:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):290:322 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
+    304:322:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):428:446 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    323:323:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
+    324:324:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):447:447 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    325:325:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
+    326:327:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):452:453 -> a
+    328:328:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:491 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    329:329:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491 -> a
+    330:375:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:536 -> a
+    376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
+    378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
+    382:385:void cleanFixupStrategy():578:581 -> a
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
+    2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.L0.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):566:566 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> a
-    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> b
-    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> c
-    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> c
-    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> c
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> d
-    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> d
-    1:2:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> e
-    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> e
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> f
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.P0.c:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):584:584 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):586:587 -> <init>
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):609:609 -> a
+    2:2:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):634:634 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):619:619 -> b
+    2:2:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):614:614 -> c
+    2:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):639:639 -> c
+    3:3:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):644:644 -> c
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):624:624 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):649:649 -> d
+    3:5:boolean registerTypeReference(com.android.tools.r8.graph.DexType):654:656 -> d
+    1:2:boolean registerField(com.android.tools.r8.graph.DexField):597:598 -> e
+    3:3:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):604:604 -> e
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):591:592 -> f
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.L0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -39416,24 +39631,24 @@
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.Set referencedFrom -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):65:80 -> <init>
-    1:1:com.android.tools.r8.graph.DexType hostType():88:88 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():98:98 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.D.e.P0.d:
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
+    1:1:com.android.tools.r8.graph.DexType hostType():90:90 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.D.e.L0.d:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Fixup -> c
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Examine -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase None -> a
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.P0.f:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):55:55 -> <init>
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.L0.f:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):33:35 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.P0.g:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.L0.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     boolean $assertionsDisabled -> i
@@ -39449,7 +39664,7 @@
     1:1:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):77:77 -> a
     2:5:void prepareCandidates():213:216 -> a
     2:5:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    6:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():92:93 -> a
+    6:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:95 -> a
     6:7:void prepareCandidates():218 -> a
     6:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     8:11:void prepareCandidates():219:222 -> a
@@ -39459,7 +39674,7 @@
     12:12:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     13:15:void prepareCandidates():225:227 -> a
     13:15:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    16:16:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    16:16:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     16:16:void prepareCandidates():228 -> a
     16:16:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     17:23:void prepareCandidates():228:234 -> a
@@ -39471,35 +39686,35 @@
     25:25:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     26:27:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:84 -> a
     28:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:87 -> a
-    33:41:java.util.Set staticizeMethodSymbols():561:569 -> a
+    33:41:java.util.Set staticizeMethodSymbols():566:574 -> a
     33:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     42:42:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    42:42:java.util.Set staticizeMethodSymbols():570 -> a
+    42:42:java.util.Set staticizeMethodSymbols():575 -> a
     42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    43:45:java.util.Set staticizeMethodSymbols():570:572 -> a
+    43:45:java.util.Set staticizeMethodSymbols():575:577 -> a
     43:45:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    46:46:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    46:46:java.util.Set staticizeMethodSymbols():573 -> a
+    46:46:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    46:46:java.util.Set staticizeMethodSymbols():578 -> a
     46:46:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    47:62:java.util.Set staticizeMethodSymbols():573:588 -> a
+    47:62:java.util.Set staticizeMethodSymbols():578:593 -> a
     47:62:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    63:101: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):615:653 -> a
-    63:101:java.util.Set staticizeMethodSymbols():590 -> a
+    63:101: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):620:658 -> a
+    63:101:java.util.Set staticizeMethodSymbols():595 -> a
     63:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    102:102:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    102:102: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):655 -> a
-    102:102:java.util.Set staticizeMethodSymbols():590 -> a
+    102:102:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    102:102: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 -> a
+    102:102:java.util.Set staticizeMethodSymbols():595 -> a
     102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    103:103: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):655:655 -> a
-    103:103:java.util.Set staticizeMethodSymbols():590 -> a
+    103:103: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:660 -> a
+    103:103:java.util.Set staticizeMethodSymbols():595 -> a
     103:103:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    104: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):654:666 -> a
-    104:116:java.util.Set staticizeMethodSymbols():590 -> a
+    104: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):659:671 -> a
+    104:116:java.util.Set staticizeMethodSymbols():595 -> a
     104:116:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     117:117:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    117:117:java.util.Set staticizeMethodSymbols():570 -> a
+    117:117:java.util.Set staticizeMethodSymbols():575 -> a
     117:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    118:119:java.util.Set staticizeMethodSymbols():596:597 -> a
+    118:119:java.util.Set staticizeMethodSymbols():601:602 -> a
     118:119:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     120:122:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):95:97 -> a
     123:164:void finalEligibilityCheck():101:142 -> a
@@ -39509,15 +39724,15 @@
     169:169:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
     169:169:void finalEligibilityCheck():155 -> a
     170:171:void finalEligibilityCheck():155:156 -> a
-    172:172:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    172:172:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -39527,7 +39742,7 @@
     242:246:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:266 -> a
     247:247:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:262 -> a
     248:260:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277:289 -> a
-    261:261:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    261:261:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     261:261:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
     262:267:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289:294 -> a
     268:268:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
@@ -39539,73 +39754,88 @@
     272:279:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):318:325 -> a
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
-    281:300:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:356 -> a
-    301:305:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):363:367 -> a
-    306:323:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):366:383 -> a
-    324:346:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):422:444 -> a
-    347:352:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):452:457 -> a
-    353:370:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):456:473 -> a
-    371:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):477:483 -> a
-    378:378:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    378:378:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):483 -> a
-    379:386:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):484:491 -> a
-    387:387:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    387:387:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):490 -> a
-    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):549:549 -> a
-    389:389:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    389:389:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551 -> a
-    390:392:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551:553 -> a
-    393:393:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    393:393:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555 -> a
-    394:394:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555:555 -> a
-    395:395:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603:603 -> a
-    396:396:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    396:396:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603 -> a
-    397:399:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603:605 -> a
-    400:400:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    400:400:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):606 -> a
-    401:401:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):606:606 -> a
-    402:402:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):605:605 -> a
-    403:403:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):606:606 -> a
-    404:404: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):671:671 -> a
-    405:405:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    405:405: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):672 -> a
-    406:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):673:674 -> a
-    408:408: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):672:672 -> a
+    281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
+    288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
+    291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
+    297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
+    299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
+    304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
+    322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
+    329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
+    337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
+    343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
+    349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
+    367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
+    378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
+    386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    386:386:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):495 -> a
+    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):554:554 -> a
+    388:388:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556 -> a
+    389:391:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556:558 -> a
+    392:392:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    392:392:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560 -> a
+    393:393:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560:560 -> a
+    394:394:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608:608 -> a
+    395:395:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    395:395:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608 -> a
+    396:398:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608:610 -> a
+    399:399:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    399:399:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):611 -> a
+    400:400:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):611:611 -> a
+    401:401:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):610:610 -> a
+    402:402:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    403:403: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):676:676 -> a
+    404:404:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    404:404:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677 -> a
+    405:406:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):678:679 -> a
+    407:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
-    23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):497 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):498:511 -> c
+    24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
     24:37:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     38:38:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    38:38:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):510 -> c
+    38:38:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):515 -> c
     38:38:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    39:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):512:512 -> c
+    39:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):517:517 -> c
     39:39:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):509:509 -> c
+    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):514:514 -> c
     40:40:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):507:530 -> c
+    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):512:535 -> c
     41:64:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    65:65:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> c
-    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532 -> c
+    65:65:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> c
+    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537 -> c
     65:65:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532:539 -> c
+    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:544 -> c
     66:73:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     74:74:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    74:74:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):538 -> c
+    74:74:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):543 -> c
     74:74:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    75:75:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):540:540 -> c
+    75:75:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):545:545 -> c
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:541 -> c
+    76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.Q0.a:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.Q0.g:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.a:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.M0.g:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int numberOfBuildersSimplified -> n
     int numberOfBuildersWithNonDeterministicArg -> l
@@ -39664,15 +39894,15 @@
     1:1:com.android.tools.r8.graph.DexItemFactory access$700(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> o
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$800(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$900(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> q
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.D.e.Q0.b:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.Q0.c:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.D.e.M0.b:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.M0.c:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState previous -> a
     java.util.Set nexts -> c
     java.lang.String addition -> b
     1:4:void <init>():963:966 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createRoot():970:970 -> a
     2:8:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createChild(java.lang.String):974:980 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.Q0.d:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.d:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():791:791 -> <clinit>
@@ -39684,7 +39914,7 @@
     21:21:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):842 -> a
     1:2:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):807:808 -> b
     1:2:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):849:850 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.Q0.e:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.M0.e:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
@@ -39712,7 +39942,7 @@
     66:66:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     67:67:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.Q0.f:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.M0.f:
     java.util.Map builderStates -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap builderToStringCounts -> b
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> f
@@ -39803,7 +40033,7 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
     240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39817,10 +40047,10 @@
     299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
-    302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
@@ -39837,7 +40067,7 @@
     380:383:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):712 -> a
     384:384:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):713:713 -> a
     385:391:void removeTrivialBuilders():728:734 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
     400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39846,7 +40076,7 @@
     403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
     413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39867,20 +40097,20 @@
     434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     449:449:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.Q0.i:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.M0.i:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -39902,7 +40132,7 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):132:135 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):136 -> a
     46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137:149 -> a
     59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
@@ -39941,20 +40171,20 @@
     191:191:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):237 -> a
     192:193:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278:279 -> a
-    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     194:194:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279 -> a
     195:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279:279 -> a
     196:199:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):200:203 -> a
     200:200:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):217:217 -> a
     201:201:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):223:223 -> a
     202:205:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):286:289 -> a
-    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     206:206:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):291 -> a
     207:236:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:321 -> a
     237:237:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     237:237:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):321 -> a
     238:267:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):322:351 -> a
-    268:268:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    268:268:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     268:268:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):356 -> a
     269:310:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):357:398 -> a
     311:361:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):379:429 -> a
@@ -39970,7 +40200,7 @@
     377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
     377:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):321 -> a
     378:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):443:444 -> a
-    380:380:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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):444 -> a
     381:384:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444:447 -> a
     385:390:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):473:478 -> a
@@ -39984,11 +40214,11 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):227:227 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):452:457 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):499:499 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):500 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):501:521 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:562 -> b
-    83:83:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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):562 -> b
     84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):562:562 -> b
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):209:209 -> c
@@ -40001,7 +40231,7 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):211:211 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):213:213 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):215:215 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.Q0.h:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.M0.h:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():569:569 -> <clinit>
     1:1:void <init>():572:572 -> <init>
@@ -40063,7 +40293,7 @@
     102:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     103:123:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
     103:123:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
-    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
@@ -40352,16 +40582,16 @@
     1354:1354:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2328 -> a
     1355:1362:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2329:2336 -> a
     1363:1398:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2444:2479 -> a
-    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1399:1399:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1400:1406:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -40489,10 +40719,10 @@
     117:117:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
     117:117:void allocateRegisters():224 -> c
     118:121:void allocateRegisters():224:227 -> c
-    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
     122:122:void allocateRegisters():227 -> c
     123:127:void allocateRegisters():228:232 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
     128:128:void allocateRegisters():227 -> c
     129:129:void allocateRegisters():236:236 -> c
     130:135:void clearState():531:536 -> c
@@ -40929,7 +41159,7 @@
     35:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):201:208 -> a
     43:45: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
     46:56:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):284:294 -> a
-    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     57:57:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     58:69:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     70:73:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -40983,42 +41213,64 @@
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> q
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.D.g.a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CfEmulateInterfaceSyntheticSourceCodeProvider -> com.android.tools.r8.D.g.c:
-    com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.method -> a
-    com.android.tools.r8.graph.AppView com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.appView -> c
-    com.android.tools.r8.graph.DexType interfaceType -> d
-    com.android.tools.r8.graph.DexMethod libraryMethod -> f
-    com.android.tools.r8.graph.DexMethod companionMethod -> e
-    java.util.List extraDispatchCases -> g
-    com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.originalMethod -> b
-    1:4:void com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.<init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:31 -> <init>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):44 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):45:48 -> <init>
-    1:40:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):53:92 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):50:50 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():68:68 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():0 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):55 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    42:42:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):56:56 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):37:43 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    51:54:void addReturn(java.util.List):104:107 -> a
-    1:2:void loadExtraParameters(java.util.List):98:99 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.D.g.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.D.g.h:
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45:45 -> a
+    1:1:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45 -> a
+    2:2:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):48:54 -> a
+    3:9:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.D.g.c:
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):286:287 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():292:300 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():298:298 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():295:307 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.D.g.d:
+    com.android.tools.r8.graph.DexString message -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):317:318 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():323:333 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():331:331 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():328:337 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.D.g.e:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):77:81 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():86:102 -> a
+    18:53:com.android.tools.r8.graph.CfCode generateCfCode():99:134 -> a
+    54:54:com.android.tools.r8.graph.CfCode generateCfCode():133:133 -> a
+    55:67:com.android.tools.r8.graph.CfCode generateCfCode():130:142 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.D.g.f:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):160:164 -> <init>
+    1:20:com.android.tools.r8.graph.CfCode generateCfCode():169:188 -> a
+    21:45:com.android.tools.r8.graph.CfCode generateCfCode():185:209 -> a
+    46:46:com.android.tools.r8.graph.CfCode generateCfCode():208:208 -> a
+    47:60:com.android.tools.r8.graph.CfCode generateCfCode():205:218 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.D.g.g:
+    com.android.tools.r8.graph.DexField wrapperField -> e
+    com.android.tools.r8.graph.DexType argType -> c
+    com.android.tools.r8.graph.DexField reverseWrapperField -> d
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):230:233 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():238:273 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():271:271 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():268:277 -> a
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.D.g.i:
+    java.util.List extraDispatchCases -> f
+    com.android.tools.r8.graph.DexType interfaceType -> c
+    com.android.tools.r8.graph.DexMethod libraryMethod -> e
+    com.android.tools.r8.graph.DexMethod companionMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):40:44 -> <init>
+    1:41:com.android.tools.r8.graph.CfCode generateCfCode():49:89 -> a
+    1:4:void addReturn(java.util.List):100:103 -> b
+    1:2:void loadExtraParameters(java.util.List):94:95 -> c
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.D.g.j:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -41039,7 +41291,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.D.g.f:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.D.g.l:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -41056,7 +41308,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> h
     1:27:boolean checkSignatures():146:172 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.D.g.e:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.D.g.k:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -41076,15 +41328,23 @@
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.D.g.g:
-    java.util.function.Consumer registryCallback -> c
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> b
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.D.g.m:
+    java.util.function.Consumer registryCallback -> d
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider,java.util.function.Consumer):20:22 -> <init>
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> p
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> q
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.D.g.h:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.D.g.n:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexType holder -> b
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
+    1:1:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):28:28 -> a
+    2:2:java.util.List defaultTryCatchs():46:46 -> a
+    2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
+    3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.D.g.o:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -46023,7 +46283,7 @@
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
     13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):98:102 -> a
     18:26:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46038,11 +46298,11 @@
     68:79:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):249:260 -> a
     68:79:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):151 -> a
     80:122:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):153:195 -> a
-    123:127:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
+    123:127:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -51449,6 +51709,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.G.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.G.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51465,6 +51726,7 @@
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.G.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.G.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51480,6 +51742,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.G.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.G.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.G.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -51493,6 +51756,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.G.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.G.b.a.c.j:
@@ -52078,7 +52342,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -52251,12 +52515,12 @@
     13:15:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):98:100 -> a
     16:20:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):96: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 com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    25:25:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     25:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
     26:26:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     26:26:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129 -> a
     27:29:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):129:131 -> a
-    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
     31:31:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     31:31:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):131 -> a
@@ -52265,7 +52529,7 @@
     33:37:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135 -> a
     38:38:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):135:135 -> a
     39:39:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139:139 -> a
-    40:40:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    40:40:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     40:40:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
     41:41:java.lang.String deobfuscateType(java.lang.String):158:158 -> a
     41:41:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):139 -> a
@@ -52277,7 +52541,7 @@
     54:58:void write(java.io.Writer):180:184 -> a
     59:59:java.lang.String lambda$write$0(com.android.tools.r8.naming.ClassNamingForNameMapper):182:182 -> a
     60:65:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):223:228 -> a
-    66:66:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    66:66:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     66:66:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):228 -> a
     67:69:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):228:230 -> a
     70:70:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):235:235 -> a
@@ -52352,7 +52616,7 @@
     72:78:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):186 -> a
     79:87:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):188:196 -> a
     88:103:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):237:252 -> a
-    104:104:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    104:104:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     104:104:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):317 -> a
     104:104:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):254 -> a
     105:121:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):317:333 -> a
@@ -52424,17 +52688,17 @@
     java.lang.String renamedName -> b
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35:35 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):124:130 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):96:96 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():134:134 -> a
-    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):147:148 -> a
-    3:4:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):140 -> a
-    5:6:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):155:156 -> a
-    5:6:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):141 -> a
-    1:11:boolean equals(java.lang.Object):223:233 -> equals
-    1:1:int hashCode():238:238 -> hashCode
+    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):122:128 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):94:94 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():132:132 -> a
+    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):145:146 -> a
+    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
+    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
-    2:2:int hashCode():238 -> hashCode
+    2:2:int hashCode():236 -> hashCode
 com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.K.m:
 com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.K.n:
     com.android.tools.r8.position.Position position -> c
@@ -52451,16 +52715,16 @@
     1:1:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:57 -> a
     2:2:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
     2:2:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58 -> a
-    3:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58:65 -> a
-    11:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):64:65 -> a
-    13:13:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
-    14:14:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    14:14:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68 -> a
-    15:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):68:73 -> a
-    21:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):72:73 -> a
-    23:23:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):71:71 -> a
-    24:24:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
-    25:25:com.android.tools.r8.naming.ClassNamingForMapApplier build():81:81 -> a
+    3:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):58:64 -> a
+    10:10:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
+    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:62 -> a
+    12:12:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
+    12:12:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67 -> a
+    13:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):67:71 -> a
+    18:18:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
+    19:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
+    20:20:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
+    21:21:com.android.tools.r8.naming.ClassNamingForMapApplier build():79:79 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.K.t:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
@@ -52617,10 +52881,10 @@
     84:84:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):77:77 -> a
     84:84:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):124 -> a
     85:86:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    87:88:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:266 -> a
+    87:88:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:272 -> a
     87:88:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     89:90:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
-    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:265 -> a
+    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:271 -> a
     91:91:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     92:96:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):143:147 -> a
     97:97:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
@@ -52851,7 +53115,7 @@
     229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
-    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
     259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
@@ -52871,7 +53135,7 @@
     322:322:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
     323:338:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):441:456 -> a
     1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):274:276 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
     4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
@@ -53036,10 +53300,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -53093,7 +53357,7 @@
     15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174 -> a
     16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175:191 -> a
     33:35:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):195:197 -> a
-    36:36:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    36:36:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     36:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):197 -> a
     37:62:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):197:222 -> a
     63:63:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):200:200 -> a
@@ -53109,7 +53373,7 @@
     94:97: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):285:288 -> a
     98:98:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):281:281 -> a
     99:113:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):297:311 -> a
-    114:114:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    114:114:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     114:114:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):311 -> a
     115:117:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):311:313 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> b
@@ -53327,7 +53591,7 @@
     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):150:166 -> a
     18:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):152:152 -> a
-    19:19:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
+    19:19:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
     19:19: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 -> a
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     20:20: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 -> a
@@ -53422,7 +53686,7 @@
     2:31:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):30:59 -> <init>
     boolean hasPrefixRewritingLogic() -> a
     com.android.tools.r8.graph.DexItem lambda$getRenamedItems$2(com.android.tools.r8.graph.DexItem) -> a
-    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     1:1:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):54 -> a
     2:2:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):55:55 -> a
     3:3:com.android.tools.r8.naming.NamingLens createPrefixRewritingNamingLens(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):36:36 -> a
@@ -53439,7 +53703,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():308:308 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> 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
@@ -53479,7 +53743,7 @@
     8:15:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):275:282 -> a
     16:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
     16:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
     19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
     20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
@@ -53489,40 +53753,40 @@
     23:23:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:284 -> a
     24:28:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283:287 -> a
     29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:108 -> a
-    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
     49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
-    53:63:void computeDefaultInterfaceMethodMethods():319:329 -> a
+    53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
     53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:360 -> a
-    64:79:void computeDefaultInterfaceMethodMethods():329 -> a
+    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:359 -> a
+    64:79:void computeDefaultInterfaceMethodMethods():328 -> a
     64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     80:80:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    80:80:void computeDefaultInterfaceMethodMethods():329 -> a
+    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360 -> a
+    80:80:void computeDefaultInterfaceMethodMethods():328 -> a
     80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361:362 -> a
-    81:82:void computeDefaultInterfaceMethodMethods():329 -> a
+    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360:361 -> a
+    81:82:void computeDefaultInterfaceMethodMethods():328 -> a
     81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     83:84:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.toUnqualified():255:256 -> a
-    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    83:84:void computeDefaultInterfaceMethodMethods():329 -> a
+    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364 -> a
+    83:84:void computeDefaultInterfaceMethodMethods():328 -> a
     83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365:365 -> a
-    85:85:void computeDefaultInterfaceMethodMethods():329 -> a
+    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:364 -> a
+    85:85:void computeDefaultInterfaceMethodMethods():328 -> a
     85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:367 -> a
-    86:89:void computeDefaultInterfaceMethodMethods():329 -> a
+    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:366 -> a
+    86:89:void computeDefaultInterfaceMethodMethods():328 -> a
     86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     90:90:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368 -> a
-    90:90:void computeDefaultInterfaceMethodMethods():329 -> a
+    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367 -> a
+    90:90:void computeDefaultInterfaceMethodMethods():328 -> a
     90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368:368 -> a
-    91:91:void computeDefaultInterfaceMethodMethods():329 -> a
+    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
+    91:91:void computeDefaultInterfaceMethodMethods():328 -> a
     91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    92:92:void computeDefaultInterfaceMethodMethods():329 -> a
+    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    92:92:void computeDefaultInterfaceMethodMethods():328 -> a
     92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
     136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:113 -> a
@@ -53537,10 +53801,10 @@
     190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
     191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:220 -> a
     205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:240 -> a
-    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
     228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
     233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
     234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
@@ -53554,63 +53818,63 @@
     254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298 -> a
     255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298:299 -> a
     257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:307 -> a
-    261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():122:122 -> a
-    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312 -> a
-    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312:312 -> a
-    263:264:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:312 -> a
-    265:269:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
+    261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
+    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
     1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
     2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
     3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.K.m0:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <init>
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
-    3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389 -> a
-    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389:390 -> a
-    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:405 -> b
-    9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> b
-    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405 -> b
-    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):406:411 -> b
-    16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> b
-    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411 -> b
-    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411:415 -> b
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <init>
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):387:388 -> a
+    3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388 -> a
+    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:404 -> b
+    9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
+    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):404 -> b
+    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405:410 -> b
+    16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
+    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410 -> b
+    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.K.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):443:443 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):451:451 -> a
-    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):461:465 -> a
-    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):505:511 -> a
-    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):508:508 -> a
-    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470:471 -> a
-    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):471 -> a
-    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):471:472 -> a
-    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):477:477 -> a
-    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):482:482 -> a
-    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:488 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):460:464 -> a
+    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):469:470 -> a
+    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470 -> a
+    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470:471 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:487 -> a
     25:25:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):488 -> a
-    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):488:490 -> a
-    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490 -> a
-    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:492 -> a
+    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487 -> a
+    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:489 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):489 -> a
+    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490:491 -> a
     32:32:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):492 -> a
-    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):492:492 -> 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):443:443 -> 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):451:451 -> b
+    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491 -> a
+    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:491 -> a
+    1:1:com.android.tools.r8.graph.DexString lambda$next$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):442:442 -> b
+    2:2:com.android.tools.r8.graph.DexString lambda$next$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.K.q0:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -53841,28 +54105,28 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     com.android.tools.r8.utils.Reporter reporter -> b
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):36:36 -> <init>
-    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):88:95 -> <init>
-    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82:82 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:74 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):68:68 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):76:78 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74:78 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):138:138 -> a
-    14:14:java.util.Set getKeyset():142:142 -> a
-    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):146:146 -> a
-    1:7:void verifyMappingsAreConflictFree():99:105 -> b
+    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):87:94 -> <init>
+    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81:81 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):72:73 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):67:67 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75:77 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:77 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):136:136 -> a
+    14:14:java.util.Set getKeyset():140:140 -> a
+    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):144:144 -> a
+    1:6:void verifyMappingsAreConflictFree():98:103 -> b
+    7:7:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
+    7:7:void verifyMappingsAreConflictFree():105 -> b
     8:8:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
-    8:8:void verifyMappingsAreConflictFree():107 -> b
-    9:9:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> b
-    9:9:void verifyMappingsAreConflictFree():108 -> b
-    10:11:void verifyMappingsAreConflictFree():108:109 -> b
-    12:16:void verifyMappingsAreConflictFree():106:110 -> b
-    17:40:void verifyMappingsAreConflictFree():105:128 -> b
+    8:8:void verifyMappingsAreConflictFree():106 -> b
+    9:10:void verifyMappingsAreConflictFree():106:107 -> b
+    11:11:void verifyMappingsAreConflictFree():104:104 -> b
+    12:35:void verifyMappingsAreConflictFree():103:126 -> b
 com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.K.w0:
 com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.K.x0:
     java.util.Map map -> a
@@ -53872,9 +54136,9 @@
     3:7:void <init>(com.android.tools.r8.utils.Reporter):39:43 -> <init>
     1:4:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):49:52 -> a
     1:4:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    5:9:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:55 -> a
-    5:9:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    10:11:com.android.tools.r8.naming.SeedMapper build():62:63 -> a
+    5:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:54 -> a
+    5:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
+    9:10:com.android.tools.r8.naming.SeedMapper build():61:62 -> a
 com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.K.z0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -53940,7 +54204,7 @@
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:39:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):44:82 -> a
     40:41:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):68:69 -> a
-    42:42:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    42:42:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     42:42:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):69 -> a
     43:46:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):69:72 -> a
     47:47:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getUnqualifiedClassNameFromDescriptor(java.lang.String):218:218 -> a
@@ -54046,20 +54310,20 @@
     2:24:void run(java.lang.Iterable):47:69 -> a
     25:26:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):63:64 -> a
     27:28:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):71:72 -> a
-    29:58: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):88:117 -> a
-    59:64:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):122:127 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    65:65:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127 -> a
-    66:79:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127:140 -> a
-    80:80:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    80:80:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
-    81:81:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
-    82:82:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    82:82:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
-    83:83:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
-    84:84:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    84:84:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
-    85:85:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
+    29:67:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):89:127 -> a
+    68:73:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):132:137 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    74:74:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137 -> a
+    75:88:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137:150 -> a
+    89:89:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    89:89:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
+    90:90:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
+    91:91:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    91:91:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
+    92:92:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
+    93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    93:93:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
+    94:94:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
     1:1:com.android.tools.r8.utils.Reporter access$300(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> c
 com.android.tools.r8.naming.signature.GenericSignatureRewriter$1 -> com.android.tools.r8.K.B0.c:
@@ -54067,39 +54331,39 @@
     java.lang.StringBuilder renamedSignature -> a
     com.android.tools.r8.naming.signature.GenericSignatureRewriter this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):143:143 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):143:143 -> <init>
-    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143:143 -> a
-    2:2:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):174:174 -> a
-    2:2:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    3:3:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):175 -> a
-    3:3:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    4:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):176:181 -> a
-    4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):180:180 -> a
-    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):179 -> a
-    11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):184:186 -> a
-    12:14:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    15:30:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):185:200 -> a
-    15:30:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    31:40:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):197:206 -> a
-    31:40:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    41:41:java.lang.String getRenamedSignature():147:147 -> a
-    42:42:void parsedSymbol(char):152:152 -> a
-    43:43:void parsedIdentifier(java.lang.String):157:157 -> a
-    1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):162:162 -> b
-    1:1:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> b
-    2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):162 -> b
-    2:2:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):163:168 -> b
-    3:8:java.lang.Object parsedTypeName(java.lang.String):143 -> b
-    9:9:void start():213:213 -> b
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):153:153 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):153:153 -> <init>
+    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153:153 -> a
+    2:2:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):184:184 -> a
+    2:2:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    3:3:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):185 -> a
+    3:3:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    4:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):186:191 -> a
+    4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
+    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
+    11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
+    12:14:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    15:30:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):195:210 -> a
+    15:30:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    31:40:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):207:216 -> a
+    31:40:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    41:41:java.lang.String getRenamedSignature():157:157 -> a
+    42:42:void parsedSymbol(char):162:162 -> a
+    43:43:void parsedIdentifier(java.lang.String):167:167 -> a
+    1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
+    1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
+    2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
+    3:8:java.lang.Object parsedTypeName(java.lang.String):153 -> b
+    9:9:void start():223:223 -> b
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.L.a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
@@ -54112,7 +54376,7 @@
     2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -54165,7 +54429,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -54802,7 +55066,13 @@
     java.lang.String catchTypeDescriptor -> e
     1:6:void <init>(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int,java.lang.String):90:95 -> <init>
     7:8:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> <init>
-    1:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:148 -> a
+    1:17:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:139 -> a
+    18:19:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    18:19:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):139 -> a
+    20:24:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):143:147 -> a
+    25:26:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
+    27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
 com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.M.a.a.s:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
@@ -55784,12 +56054,12 @@
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:java.lang.String getDescription():53:53 -> getDescription
     1:1:java.lang.String getHolder():31:31 -> getHolder
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> getHolder
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> getHolder
     2:2:java.lang.String getHolder():31 -> getHolder
     1:1:java.lang.String getName():26:26 -> getName
     1:3:java.util.List getParameterTypes():41:43 -> getParameterTypes
     1:1:java.lang.String getReturnType():36:36 -> getReturnType
-    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> getReturnType
+    2:2:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> getReturnType
     2:2:java.lang.String getReturnType():36 -> getReturnType
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():48:48 -> toString
@@ -56145,7 +56415,7 @@
     24:39:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
     24:39:void processClass(com.android.tools.r8.graph.DexType):41 -> a
     40:43:void processClass(com.android.tools.r8.graph.DexType):43:46 -> a
-    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
@@ -56249,132 +56519,133 @@
     4:11:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):403:410 -> c
     4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259 -> c
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.d:
-    java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> y
-    java.util.SortedMap virtualInvokes -> z
-    java.util.Set prunedTypes -> T
-    boolean $assertionsDisabled -> X
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> w
-    java.util.IdentityHashMap indirectlyInstantiatedTypes -> q
-    java.util.Map enumValueInfoMaps -> V
-    java.util.SortedSet liveMethods -> v
-    java.util.SortedSet methodsTargetedByInvokeDynamic -> t
-    java.util.SortedSet targetedMethods -> r
-    java.util.Set instantiatedAppServices -> o
-    java.util.Map assumedValues -> J
-    java.util.Set neverClassInline -> P
-    java.util.Set neverPropagateValue -> R
-    java.util.SortedMap directInvokes -> C
-    java.util.Set forceInline -> L
-    java.util.Set liveTypes -> m
-    java.util.SortedMap interfaceInvokes -> A
-    java.util.Map mayHaveSideEffects -> H
-    java.util.Set keepConstantArguments -> N
-    java.util.Set instantiatedLambdas -> W
-    java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> x
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> S
-    java.util.Map switchMaps -> U
-    java.util.Set pinnedItems -> G
-    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> u
-    java.util.SortedSet bootstrapMethods -> s
-    java.util.Set callSites -> E
-    java.util.Map noSideEffects -> I
-    java.util.Set keepUnusedArguments -> O
-    java.util.Set instantiatedTypes -> p
-    java.util.SortedMap staticInvokes -> D
-    java.util.Set neverMerge -> Q
-    java.util.SortedMap superInvokes -> B
-    java.util.Set alwaysInline -> K
-    java.util.SortedSet brokenSuperInvokes -> F
-    java.util.Set neverInline -> M
-    java.util.Set instantiatedAnnotationTypes -> n
+    java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> y
+    java.util.Set neverPropagateValue -> T
+    java.util.Set prunedTypes -> V
+    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> v
+    java.util.Map enumValueInfoMaps -> X
+    java.util.SortedSet bootstrapMethods -> t
+    java.util.Set pinnedItems -> H
+    boolean $assertionsDisabled -> Z
+    java.util.Set callSites -> F
+    java.util.Set instantiatedAnnotationTypes -> o
+    java.util.Map noSideEffects -> J
+    java.util.Set keepConstantArguments -> P
+    java.util.Set instantiatedTypes -> q
+    java.util.SortedMap staticInvokes -> E
+    java.util.Set neverClassInline -> R
+    java.util.SortedMap superInvokes -> C
+    java.util.Set alwaysInline -> L
+    java.util.SortedMap virtualInvokes -> A
+    java.util.SortedSet brokenSuperInvokes -> G
+    java.util.Set neverInline -> N
+    java.util.Set instantiatedLambdas -> Y
+    java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> z
+    java.util.Set neverMerge -> S
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> x
+    java.util.IdentityHashMap indirectlyInstantiatedTypes -> r
+    java.util.Map switchMaps -> W
+    java.util.SortedSet liveMethods -> w
+    java.util.SortedSet methodsTargetedByInvokeDynamic -> u
+    java.util.SortedSet targetedMethods -> s
+    java.util.Map mayHaveSideEffects -> I
+    java.util.Set whyAreYouNotInlining -> O
+    java.util.Set instantiatedAppServices -> p
+    java.util.SortedMap directInvokes -> D
+    java.util.Map assumedValues -> K
+    java.util.Set keepUnusedArguments -> Q
+    java.util.SortedMap interfaceInvokes -> B
+    java.util.Set forceInline -> M
+    java.util.Set liveTypes -> n
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):224:224 -> <init>
-    2:190:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:262 -> <init>
-    191:191:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):303:303 -> <init>
-    192:459:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:341 -> <init>
-    460:498:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:391 -> <init>
-    499:542:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:396 -> <init>
-    543:543:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):401:401 -> <init>
-    544:923:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:453 -> <init>
-    924:940:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):449:465 -> <init>
-    941:956:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):461:476 -> <init>
-    957:963:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):472:478 -> <init>
-    964:964:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):485:485 -> <init>
-    965:1415:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:524 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):545:577 -> a
-    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):590:595 -> a
-    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:609 -> a
-    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:607 -> a
-    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):628:639 -> a
-    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):678:688 -> a
-    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):739:744 -> a
-    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):750:759 -> a
-    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):755:755 -> a
-    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
-    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996 -> a
-    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996:996 -> a
-    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):787:806 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996 -> a
-    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):997:1035 -> a
-    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
-    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):826:827 -> a
-    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):832:833 -> a
-    152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):852:867 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):865:865 -> a
-    169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):863:863 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1068:1069 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):861 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:876 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):859 -> a
-    174:183:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1051:1060 -> a
-    184:237: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):1077:1130 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:509:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    510:554:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    555:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    556:942:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    943:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    962:977:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    978:984:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    985:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    986:1446:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> a
+    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> a
+    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> a
+    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> a
+    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> a
+    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> a
+    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> a
+    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006:1006 -> a
+    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1007:1045 -> a
+    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
+    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
+    152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> a
+    169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1078:1079 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):885:886 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869 -> a
+    174:183:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1061:1070 -> a
+    184:237: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):1087:1140 -> a
     238:238:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    238:238: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):1129 -> a
-    239:266: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):1131:1158 -> a
-    267:269:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1169:1171 -> a
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):528:528 -> b
-    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):583:587 -> b
-    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):345:345 -> b
-    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):587 -> b
-    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):588:601 -> b
-    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):599:599 -> b
-    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):692:693 -> b
-    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):728:728 -> b
-    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> b
-    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):729 -> b
-    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):729:729 -> b
-    29:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):884:954 -> b
-    100: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):950:958 -> b
-    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):936:936 -> b
-    110:117:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):963:970 -> b
-    118:120:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1162:1164 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):618:619 -> c
-    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):697:708 -> c
-    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):722:723 -> d
+    238:238: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):1139 -> a
+    239:266: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):1141:1168 -> a
+    267:269:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1179:1181 -> a
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
+    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
+    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
+    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):597 -> b
+    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):598:611 -> b
+    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> b
+    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> b
+    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:738 -> b
+    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> b
+    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739 -> b
+    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739:739 -> b
+    29:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):894:964 -> b
+    100: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):960:968 -> b
+    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):946:946 -> b
+    110:117:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):973:980 -> b
+    118:120:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1172:1174 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
+    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
+    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
     3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> d
-    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):723 -> d
-    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):723:724 -> d
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):733:734 -> e
-    1:1:boolean hasLiveness():770:770 -> g
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):764:765 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():776:776 -> l
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):613:614 -> p
-    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():624:624 -> p
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):672:673 -> q
-    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):645:650 -> q
-    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):674 -> q
-    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):674:674 -> q
-    10:11:java.util.Set getPrunedTypes():846:847 -> q
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):654:668 -> r
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):532:533 -> s
-    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):528:528 -> s
-    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):533 -> s
-    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):537:541 -> t
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):841:842 -> u
+    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733 -> d
+    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733:734 -> d
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> e
+    1:1:boolean hasLiveness():780:780 -> g
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> l
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> p
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
+    3:4:java.util.Set getPrunedTypes():856:857 -> q
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
+    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
+    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
+    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
+    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
+    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):543 -> t
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> u
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> v
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):177:179 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.h:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> q
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
@@ -56453,7 +56724,7 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.B:
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
     com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> P
     java.util.Map annotationNodes -> s
     boolean $assertionsDisabled -> b0
@@ -56512,7 +56783,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):323:323 -> <init>
     2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):145:336 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1710 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:com.android.tools.r8.shaking.Enqueuer$GraphReporter access$000(com.android.tools.r8.shaking.Enqueuer):117:117 -> a
@@ -56541,7 +56812,7 @@
     72:76:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):451:455 -> a
     77:77:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
     77:77:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455 -> a
-    78:78:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):593:593 -> a
+    78:78:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):599:599 -> a
     78:78:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
     78:78:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455 -> a
     79:94:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:471 -> a
@@ -56551,347 +56822,344 @@
     103:104:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):544:545 -> a
     105:133:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):550:578 -> a
     134:134:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1055:1055 -> a
-    135:142:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1609:1616 -> a
-    135:142:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    143:149:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):3296:3302 -> a
-    143:149:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1616 -> a
-    143:149:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    150:150:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1613:1613 -> a
-    150:150:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
-    151:161:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062:1072 -> a
-    151:161:com.android.tools.r8.graph.DexMethod access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    162:177:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1110:1125 -> a
-    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1122:1122 -> a
-    179:183:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1137:1141 -> a
-    184:184:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    184:184:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1142 -> a
-    185:185:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145:1145 -> a
-    186:186:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
-    186:186:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145 -> a
-    187:187:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1147:1147 -> a
-    188:212:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1250 -> a
-    188:212:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1148 -> a
-    213:218:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1151:1156 -> a
-    219:222:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1216:1219 -> a
-    219:222:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    223:228:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):336:341 -> a
-    223:228:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1219 -> a
-    223:228:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    229:229:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1220:1220 -> a
-    229:229:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
-    230:238:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1179:1187 -> a
-    239:249:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):486:496 -> a
-    239:249:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    250:250:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    250:250:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497 -> a
-    250:250:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    251:251:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497:497 -> a
-    251:251:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
-    252:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1191:1203 -> a
-    265:265:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204 -> a
-    266:266:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204:1204 -> a
-    267:267:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
-    267:267:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
-    268:268:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    268:268:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
-    268:268:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
-    269:269:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1198:1198 -> a
-    270:273:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1208:1211 -> a
-    274:274:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1256:1256 -> a
-    275:275:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1260:1260 -> a
-    276:276:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
-    276:276:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1261 -> a
-    277:277:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
-    277:277:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2495 -> a
-    278:286:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1278 -> a
-    287:287:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
-    287:287:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1282 -> a
-    288:291:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1286 -> a
-    292:312:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1290:1310 -> a
-    292:312:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    313:314:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> a
-    313:314:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1311 -> a
-    313:314:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    315:315:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1312:1312 -> a
-    315:315:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
-    316:344:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1327:1355 -> a
-    345:369:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1360:1384 -> a
-    370:370:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
-    370:370:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    371:371:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    371:371:void reportMissingField(com.android.tools.r8.graph.DexField):1403 -> a
-    371:371:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    372:372:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
-    372:372:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
-    373:373:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443:1443 -> a
-    374:374:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    374:374:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443 -> a
-    375:383:void markLibraryAndClasspathMethodOverriddesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> a
-    384:387:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574:1577 -> a
-    388:419:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2428:2459 -> a
-    388:419:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1578 -> a
-    420:421:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1580 -> a
-    422:422:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
-    422:422:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
-    423:423:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
-    424:431:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1594:1601 -> a
-    432:432:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> a
-    433:453:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1721:1741 -> a
-    433:453:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    454:454:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    454:454:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1742 -> a
-    454:454:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    455:456:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1743:1744 -> a
-    455:456:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
-    457:457:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1782:1782 -> a
-    458:458:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1796:1796 -> a
-    459:459:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1817:1817 -> a
-    460:460:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825:1825 -> a
-    461:461:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1833:1833 -> a
-    461:461:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    462:462:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    462:462:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1834 -> a
-    462:462:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    463:479:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1836:1852 -> a
-    463:479:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    480:509:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1935:1964 -> a
-    480:509:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    480:509:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    510:525:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1983:1998 -> a
-    510:525:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    510:525:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    510:525:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    526:529:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1984:1987 -> a
-    526:529:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    526:529:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    526:529:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    530:536:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1986:1992 -> a
-    530:536:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1966 -> a
-    530:536:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855 -> a
-    530:536:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    537:546:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1856:1865 -> a
-    537:546:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    547:547:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.overridesMethod(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
-    547:547:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1868 -> a
-    547:547:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    548:552:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1869:1873 -> a
-    548:552:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825 -> a
-    553:553:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1884 -> a
-    554:554:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    554:554:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
-    554:554:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884 -> a
-    555:567:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1896 -> a
-    568:568:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1786:1786 -> a
-    568:568:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1904 -> a
-    569:589:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1908:1928 -> a
-    590:590:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1911:1911 -> a
-    591:602:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2032:2043 -> a
-    603:603:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
-    603:603:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2046 -> a
-    604:623:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2045:2064 -> a
-    624:624:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    624:624:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2064 -> a
-    625:630:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2067:2072 -> a
-    631:638:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2081:2088 -> a
-    639:646: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):2097:2104 -> a
-    647:650:boolean verifyKeptGraph():2117:2120 -> a
-    647:650: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):2104 -> a
-    651:669:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2127:2145 -> a
-    651:669:boolean verifyKeptGraph():2120 -> a
-    651:669: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):2104 -> a
-    670:670: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):2105:2105 -> a
-    671:672:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2109:2110 -> a
-    673:688:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2150:2165 -> a
-    689:710:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2164:2185 -> a
-    711:716:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2220:2225 -> a
-    711:716:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2198 -> a
-    717:721:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2199:2203 -> a
-    722:724:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2202:2204 -> a
-    725:725:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2152:2152 -> a
-    726:726:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2157:2157 -> a
-    727:732:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2210:2215 -> a
-    733:771:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2231:2269 -> a
-    772:772:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> a
-    773:773:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2263 -> a
-    774:774:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2260:2260 -> a
-    775:775:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2256:2256 -> a
-    776:776:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2253 -> a
-    777:777:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2250:2250 -> a
-    778:778:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2247:2247 -> a
-    779:779:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1323:1323 -> a
-    779:779:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2247 -> a
-    780:780:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2244:2244 -> a
-    781:828:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2241:2288 -> a
-    829:829:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):105:105 -> a
-    829:829:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288 -> a
-    830:895:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2289:2354 -> a
-    896:905:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2353:2362 -> a
-    906:910:void unpinLambdaMethods():2368:2372 -> a
-    906:910:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2364 -> a
-    911:911:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2362:2362 -> a
-    912:912:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2285:2285 -> a
-    913:913:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2306:2306 -> a
-    914:914:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311:2311 -> a
-    915:915:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    915:915:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311 -> a
-    916:916:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312:2312 -> a
-    917:917:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
-    917:917:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2313 -> a
-    918:918:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    918:918:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
-    918:918:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2313 -> a
-    919:919:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    919:919:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312 -> a
-    920:948:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2376:2404 -> a
-    949:958:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2401:2410 -> a
-    959:966:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2415:2422 -> a
-    967:967:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2503:2503 -> a
-    968:970:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2517:2519 -> a
-    971:971:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    971:971:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519 -> a
-    972:972:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519:2519 -> a
-    973:975:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2542:2544 -> a
-    976:976:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    976:976:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2545 -> a
-    977:978:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2546:2547 -> a
-    979:985:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2559 -> a
-    979:985:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    986:993:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2648:2655 -> a
-    986:993:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    986:993:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    994:1002:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2662 -> a
-    994:1002:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    994:1002:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1003:1003:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1003:1003:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2666 -> a
-    1003:1003:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    1003:1003:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1004:1007:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2668:2671 -> a
-    1004:1007:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2560 -> a
-    1004:1007:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1008:1008:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2563:2563 -> a
-    1008:1008:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1009:1014:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2678:2683 -> a
-    1009:1014:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1009:1014:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1015:1015:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683 -> a
-    1015:1015:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1015:1015:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1016:1030:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2684:2698 -> a
-    1016:1030:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1016:1030:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1031:1057:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2697:2723 -> a
-    1031:1057:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1031:1057:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1058:1058:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1058:1058:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2725 -> a
-    1058:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1058:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1059:1103:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2727:2771 -> a
-    1059:1103:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1059:1103:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1104:1104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1104:1104:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683 -> a
-    1104:1104:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2564 -> a
-    1104:1104:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1105:1105:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2567:2567 -> a
-    1105:1105:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1106:1111:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2818:2823 -> a
-    1106:1111:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2568 -> a
-    1106:1111:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1112:1112:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2571:2571 -> a
-    1112:1112:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1113:1140:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2781:2808 -> a
-    1113:1140:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2572 -> a
-    1113:1140:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1141:1141:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2575:2575 -> a
-    1141:1141:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1142:1147:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2829:2834 -> a
-    1142:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1142:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
+    135:143:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1607:1615 -> a
+    135:143:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    144:144:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1614:1614 -> a
+    144:144:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    145:145:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1611 -> a
+    145:145:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1057 -> a
+    146:156:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062:1072 -> a
+    146:156:com.android.tools.r8.graph.DexMethod access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    157:172:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1110:1125 -> a
+    173:173:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1122:1122 -> a
+    174:178:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1137:1141 -> a
+    179:179:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    179:179:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1142 -> a
+    180:180:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145:1145 -> a
+    181:181:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    181:181:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145 -> a
+    182:182:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1147:1147 -> a
+    183:207:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1250 -> a
+    183:207:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1148 -> a
+    208:213:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1151:1156 -> a
+    214:217:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1216:1219 -> a
+    214:217:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    218:223:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):342:347 -> a
+    218:223:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1219 -> a
+    218:223:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    224:224:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1220:1220 -> a
+    224:224:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1175 -> a
+    225:233:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1179:1187 -> a
+    234:244:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):486:496 -> a
+    234:244:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    245:245:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    245:245:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497 -> a
+    245:245:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    246:246:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497:497 -> a
+    246:246:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1188 -> a
+    247:259:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1191:1203 -> a
+    260:260:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    260:260:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204 -> a
+    261:261:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204:1204 -> a
+    262:262:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
+    262:262:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
+    263:263:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
+    263:263:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
+    263:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203 -> a
+    264:264:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1198:1198 -> a
+    265:268:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1208:1211 -> a
+    269:269:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1256:1256 -> a
+    270:270:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1260:1260 -> a
+    271:271:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
+    271:271:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1261 -> a
+    272:272:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> a
+    272:272:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2516 -> a
+    273:281:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1278 -> a
+    282:282:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    282:282:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1282 -> a
+    283:286:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1286 -> a
+    287:307:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1290:1310 -> a
+    287:307:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    308:309:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> a
+    308:309:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1311 -> a
+    308:309:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    310:310:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1312:1312 -> a
+    310:310:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117 -> a
+    311:339:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1327:1355 -> a
+    340:364:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1360:1384 -> a
+    365:365:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
+    365:365:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    366:366:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    366:366:void reportMissingField(com.android.tools.r8.graph.DexField):1403 -> a
+    366:366:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    367:367:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1402 -> a
+    367:367:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117 -> a
+    368:368:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443:1443 -> a
+    369:369:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    369:369:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443 -> a
+    370:378:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> a
+    379:382:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574:1577 -> a
+    383:414:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2449:2480 -> a
+    383:414:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1578 -> a
+    415:416:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1580 -> a
+    417:417:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    417:417:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    418:418:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
+    419:426:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1594:1601 -> a
+    427:427:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1652:1652 -> a
+    428:448:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1720:1740 -> a
+    428:448:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    449:449:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    449:449:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1741 -> a
+    449:449:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    450:451:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1742:1743 -> a
+    450:451:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    452:452:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1781:1781 -> a
+    453:453:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1795:1795 -> a
+    454:454:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1816:1816 -> a
+    455:455:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824:1824 -> a
+    456:482:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1832:1858 -> a
+    456:482:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    483:483:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    483:483:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1859 -> a
+    483:483:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    484:521:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1951:1988 -> a
+    484:521:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    484:521:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    522:537:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2006:2021 -> a
+    522:537:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    522:537:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    522:537:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    538:541:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2007:2010 -> a
+    538:541:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    538:541:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    538:541:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    542:550:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2009:2017 -> a
+    542:550:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987 -> a
+    542:550:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    542:550:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    551:560:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1989:1998 -> a
+    551:560:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863 -> a
+    551:560:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    561:583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1864:1886 -> a
+    561:583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824 -> a
+    584:584:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1894 -> a
+    585:585:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    585:585:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
+    585:585:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894 -> a
+    586:598:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1906 -> a
+    599:599:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1785:1785 -> a
+    599:599:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1914 -> a
+    600:623:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918:1941 -> a
+    624:630:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1938:1944 -> a
+    631:634:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1924 -> a
+    635:635:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1921 -> a
+    636:647:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2053:2064 -> a
+    648:648:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
+    648:648:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2067 -> a
+    649:668:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2066:2085 -> a
+    669:669:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    669:669:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2085 -> a
+    670:675:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2088:2093 -> a
+    676:683:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2102:2109 -> a
+    684:691: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):2118:2125 -> a
+    692:695:boolean verifyKeptGraph():2138:2141 -> a
+    692:695: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):2125 -> a
+    696:714:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2148:2166 -> a
+    696:714:boolean verifyKeptGraph():2141 -> a
+    696:714: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):2125 -> a
+    715:715: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):2126:2126 -> a
+    716:717:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2130:2131 -> a
+    718:733:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2171:2186 -> a
+    734:755:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2185:2206 -> a
+    756:761:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2242:2247 -> a
+    756:761:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2220 -> a
+    762:766:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2221:2225 -> a
+    767:769:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2224:2226 -> a
+    770:770:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2173:2173 -> a
+    771:771:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2178:2178 -> a
+    772:777:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2232:2237 -> a
+    778:816:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2291 -> a
+    817:817:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2288 -> a
+    818:818:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2285:2285 -> a
+    819:819:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2282:2282 -> a
+    820:820:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2278:2278 -> a
+    821:821:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2275:2275 -> a
+    822:822:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2272 -> a
+    823:823:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2269:2269 -> a
+    824:824:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1323:1323 -> a
+    824:824:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2269 -> a
+    825:825:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> a
+    826:873:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2310 -> a
+    874:874:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    874:874:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2310 -> a
+    875:939:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2311:2375 -> a
+    940:949:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2374:2383 -> a
+    950:954:void unpinLambdaMethods():2389:2393 -> a
+    950:954:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2385 -> a
+    955:955:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2383:2383 -> a
+    956:956:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2307:2307 -> a
+    957:957:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2328:2328 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333:2333 -> a
+    959:959:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334:2334 -> a
+    961:961:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:514 -> a
+    961:961:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335 -> a
+    962:962:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
+    962:962:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):517 -> a
+    962:962:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335 -> a
+    963:963:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    963:963:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334 -> a
+    964:992:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2397:2425 -> a
+    993:1002:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2422:2431 -> a
+    1003:1010:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2436:2443 -> a
+    1011:1011:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2524:2524 -> a
+    1012:1014:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2538:2540 -> a
+    1015:1015:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1015:1015:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540 -> a
+    1016:1016:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540:2540 -> a
+    1017:1019:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2563:2565 -> a
+    1020:1020:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    1020:1020:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2566 -> a
+    1021:1022:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2567:2568 -> a
+    1023:1029:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2574:2580 -> a
+    1023:1029:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1030:1037:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669:2676 -> a
+    1030:1037:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1030:1037:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1038:1046:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2683 -> a
+    1038:1046:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1038:1046:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1047:1047:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1047:1047:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2687 -> a
+    1047:1047:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1047:1047:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1048:1051:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2689:2692 -> a
+    1048:1051:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581 -> a
+    1048:1051:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1052:1052:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2584:2584 -> a
+    1052:1052:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1053:1058:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2699:2704 -> a
+    1053:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1053:1058:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1059:1059:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1059:1059:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2704 -> a
+    1059:1059:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1059:1059:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1060:1074:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2705:2719 -> a
+    1060:1074:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1060:1074:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1075:1101:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2718:2744 -> a
+    1075:1101:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1075:1101:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1102:1102:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1102:1102:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2746 -> a
+    1102:1102:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1102:1102:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1103:1147:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2748:2792 -> a
+    1103:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1103:1147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
     1148:1148:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1148:1148:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2834 -> a
-    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1149:1161:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2835:2847 -> a
-    1149:1161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1149:1161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1162:1178:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2840:2856 -> a
-    1162:1178:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1162:1178:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1179:1179:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    1179:1179:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2834 -> a
-    1179:1179:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2576 -> a
-    1179:1179:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1180:1194:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2579:2593 -> a
-    1180:1194:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1195:1195:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    1195:1195:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2594 -> a
-    1195:1195:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1196:1224:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2595:2623 -> a
-    1196:1224:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1225:1225:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> a
-    1225:1225:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2623 -> a
-    1225:1225:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1226:1226:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> a
-    1226:1226:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1227:1227:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> a
-    1227:1227:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624 -> a
-    1227:1227:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1228:1242:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2627:2641 -> a
-    1228:1242:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1243:1243:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2639:2639 -> a
-    1243:1243:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1244:1244:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2638:2638 -> a
-    1244:1244:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2548 -> a
-    1245:1245:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():877:877 -> a
-    1245:1245:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2545 -> a
-    1246:1258:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2862:2874 -> a
-    1259:1263:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3257:3261 -> a
-    1264:1264:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3341:3341 -> a
-    1264:1264:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3261 -> a
-    1265:1266:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3261:3262 -> a
-    1267:1270:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3288:3291 -> a
-    1271:1271:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3325:3325 -> a
-    1272:1272:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3341:3341 -> a
-    1272:1272:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3326 -> a
-    1273:1273:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3328:3328 -> a
-    1274:1274:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3358:3358 -> a
-    1274:1274:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3329 -> a
-    1275:1277:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3330:3332 -> a
-    1278:1287:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3345:3354 -> a
-    1288:1288:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> a
-    1289:1289:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3366:3366 -> a
-    1290:1293:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3367:3370 -> a
-    1294:1294:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3375:3375 -> a
-    1295:1295:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3386:3386 -> a
-    1296:1298:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3389:3391 -> a
-    1299:1299:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1299:1299:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3392 -> a
-    1300:1303:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3392:3395 -> a
-    1304:1304:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1304:1304:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3397 -> a
-    1305:1310:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3397:3402 -> a
-    1311:1311:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1311:1311:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3402 -> a
-    1312:1312:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3402:3402 -> a
-    1313:1313:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3396:3396 -> a
-    1314:1314:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3407:3407 -> a
-    1315:1317:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3410:3412 -> a
-    1318:1318:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1318:1318:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3414 -> a
-    1319:1320:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3414:3415 -> a
-    1321:1321:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    1321:1321:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3416 -> a
-    1322:1322:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3416:3416 -> a
-    1323:1323:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3413:3413 -> a
-    1324:1344:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3429:3449 -> a
-    1345:1345:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3434:3434 -> a
-    1346:1350:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3442:3446 -> a
+    1148:1148:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2704 -> a
+    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2585 -> a
+    1148:1148:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1149:1149:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2588:2588 -> a
+    1149:1149:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1150:1155:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2839:2844 -> a
+    1150:1155:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2589 -> a
+    1150:1155:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1156:1156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2592:2592 -> a
+    1156:1156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1157:1184:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2802:2829 -> a
+    1157:1184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2593 -> a
+    1157:1184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1185:1185:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2596:2596 -> a
+    1185:1185:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1186:1191:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2850:2855 -> a
+    1186:1191:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1186:1191:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1192:1192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1192:1192:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> a
+    1192:1192:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1192:1192:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1193:1205:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2868 -> a
+    1193:1205:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1193:1205:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1206:1222:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861:2877 -> a
+    1206:1222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1206:1222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1223:1223:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1223:1223:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> a
+    1223:1223:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597 -> a
+    1223:1223:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1224:1238:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2600:2614 -> a
+    1224:1238:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1239:1239:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1239:1239:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2615 -> a
+    1239:1239:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1240:1268:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2616:2644 -> a
+    1240:1268:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1269:1269:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> a
+    1269:1269:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2644 -> a
+    1269:1269:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1270:1270:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2645:2645 -> a
+    1270:1270:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1271:1271:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> a
+    1271:1271:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2645 -> a
+    1271:1271:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1272:1286:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2648:2662 -> a
+    1272:1286:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1287:1287:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2660:2660 -> a
+    1287:1287:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1288:1288:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2659:2659 -> a
+    1288:1288:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2569 -> a
+    1289:1289:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    1289:1289:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2566 -> a
+    1290:1302:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2883:2895 -> a
+    1303:1307:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3338:3342 -> a
+    1308:1308:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3411:3411 -> a
+    1308:1308:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3342 -> a
+    1309:1310:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3342:3343 -> a
+    1311:1314:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3369:3372 -> a
+    1315:1315:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3395:3395 -> a
+    1316:1316:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3411:3411 -> a
+    1316:1316:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3396 -> a
+    1317:1317:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3398:3398 -> a
+    1318:1318:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3428:3428 -> a
+    1318:1318:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3399 -> a
+    1319:1321:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3400:3402 -> a
+    1322:1331:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3415:3424 -> a
+    1332:1332:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> a
+    1333:1333:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3436:3436 -> a
+    1334:1337:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3437:3440 -> a
+    1338:1338:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3445:3445 -> a
+    1339:1339:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3456:3456 -> a
+    1340:1342:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459:3461 -> a
+    1343:1343:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1343:1343:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3462 -> a
+    1344:1347:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3462:3465 -> a
+    1348:1348:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1348:1348:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3467 -> a
+    1349:1354:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3467:3472 -> a
+    1355:1355:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1355:1355:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3472 -> a
+    1356:1356:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3472:3472 -> a
+    1357:1357:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3466:3466 -> a
+    1358:1358:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3477:3477 -> a
+    1359:1361:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3480:3482 -> a
+    1362:1362:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1362:1362:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3484 -> a
+    1363:1364:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3484:3485 -> a
+    1365:1365:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    1365:1365:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3486 -> a
+    1366:1366:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3486:3486 -> a
+    1367:1367:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3483:3483 -> a
+    1368:1388:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3499:3519 -> a
+    1389:1389:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3504:3504 -> a
+    1390:1394:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3512:3516 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1692 -> b
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1691 -> b
     2:2:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.shaking.Enqueuer):117:117 -> b
     3:3:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> b
     4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> b
@@ -56911,40 +57179,40 @@
     41:41:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1199:1199 -> b
     42:42:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> b
     42:42:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1419 -> b
-    43:49:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1643:1649 -> b
-    50:50:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1654:1654 -> b
-    51:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1696:1701 -> b
+    43:49:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1642:1648 -> b
+    50:50:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> b
+    51:56:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1695:1700 -> b
     57:57:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    57:57:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1701 -> b
-    58:65:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1703:1710 -> b
-    66:74:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1751:1759 -> b
+    57:57:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1700 -> b
+    58:65:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1702:1709 -> b
+    66:74:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1750:1758 -> b
     75:76:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1080:1081 -> b
-    75:76:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759 -> b
-    77:77:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1760 -> b
+    75:76:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1758 -> b
+    77:77:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759:1759 -> b
     78:78:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1086:1086 -> b
-    78:78:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760 -> b
-    79:81:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761:1763 -> b
+    78:78:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1759 -> b
+    79:81:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1762 -> b
     82:82:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    82:82:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1762 -> b
-    83:83:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1798:1798 -> b
-    84:84:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1895:1895 -> b
-    85:89:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2004:2008 -> b
-    85:89:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    90:90:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> b
-    90:90:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2008 -> b
-    90:90:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    91:91:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2008:2008 -> b
-    91:91:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    92:97:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2007:2012 -> b
-    92:97:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016 -> b
-    98:104:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016:2022 -> b
-    105:105:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2068:2068 -> b
-    106:106:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2333:2333 -> b
-    107:110:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3306:3309 -> b
-    111:112:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3336:3337 -> b
-    111:112:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3309 -> b
-    113:115:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3312:3314 -> b
-    116:116:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> b
+    82:82:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> b
+    83:83:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1797:1797 -> b
+    84:84:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1905:1905 -> b
+    85:89:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2025:2029 -> b
+    85:89:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    90:90:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    90:90:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2029 -> b
+    90:90:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    91:91:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2029:2029 -> b
+    91:91:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    92:97:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2028:2033 -> b
+    92:97:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037 -> b
+    98:104:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037:2043 -> b
+    105:105:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2089:2089 -> b
+    106:106:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2355:2355 -> b
+    107:110:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3376:3379 -> b
+    111:112:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3406:3407 -> b
+    111:112:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3379 -> b
+    113:115:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3382:3384 -> b
+    116:116:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> b
     1:1:java.util.Map access$1100(com.android.tools.r8.shaking.Enqueuer):117:117 -> c
     2:2:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> c
     3:4:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():384:385 -> c
@@ -56957,81 +57225,81 @@
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
     23:23:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1422 -> c
     24:27:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1424:1427 -> c
-    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> c
+    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559:2559 -> c
     28:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    29:34:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> c
-    29:34:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538 -> c
+    29:34:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3215:3220 -> c
+    29:34:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559 -> c
     29:34:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    35:35:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> c
+    35:35:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559:2559 -> c
     35:35:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
-    36:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3158:3158 -> c
-    36:36:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538 -> c
+    36:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness com.android.tools.r8.shaking.Enqueuer$GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> c
+    36:36:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559 -> c
     36:36:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1428 -> c
     37:37:com.android.tools.r8.shaking.KeepReason lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1415:1415 -> c
     38:50:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1466:1478 -> c
-    51:51:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1661:1661 -> c
-    52:53:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714:1715 -> c
+    51:51:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1660:1660 -> c
+    52:53:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1713:1714 -> c
     54:54:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    54:54:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1715 -> c
-    55:55:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1717:1717 -> c
-    56:57:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1790:1791 -> c
+    54:54:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714 -> c
+    55:55:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1716:1716 -> c
+    56:57:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1789:1790 -> c
     58:58:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    58:58:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1792 -> c
-    59:74:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1795:1810 -> c
-    75:75:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1786:1786 -> c
-    75:75:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812 -> c
-    76:81:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1813:1818 -> c
-    82:93:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2468:2479 -> c
+    58:58:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1791 -> c
+    59:74:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1794:1809 -> c
+    75:75:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1785:1785 -> c
+    75:75:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1811 -> c
+    76:81:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1817 -> c
+    82:93:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> c
     94:94:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    94:94:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2479 -> c
-    95:99:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2481:2485 -> c
-    100:103:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2484:2487 -> c
-    104:121:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2486:2503 -> c
+    94:94:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> c
+    95:99:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> c
+    100:103:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> c
+    104:121:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2524 -> c
     1:1:java.util.Map access$1300(com.android.tools.r8.shaking.Enqueuer):117:117 -> d
     2:8:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):475:481 -> d
-    9:10:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1653:1654 -> d
-    11:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1659:1665 -> d
+    9:10:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1652:1653 -> d
+    11:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1658:1664 -> d
     18:19:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> d
-    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1670 -> d
-    20:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1675:1676 -> d
+    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1669 -> d
+    20:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1674:1675 -> d
     22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> d
-    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1677 -> d
-    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680:1680 -> d
+    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1676 -> d
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1679:1679 -> d
     24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    24:24:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1681 -> d
-    25:32:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1685:1692 -> d
-    33:33:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1663:1663 -> d
-    34:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1769:1773 -> d
-    39:39:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1771:1771 -> d
+    24:24:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    25:32:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684:1691 -> d
+    33:33:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1662:1662 -> d
+    34:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1768:1772 -> d
+    39:39:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1770:1770 -> d
     40:40:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> d
-    40:40:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1772 -> d
-    41:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1774:1775 -> d
+    40:40:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1771 -> d
+    41:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1774 -> d
     43:43:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    43:43:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> d
-    44:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2507:2511 -> d
-    49:49:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2509:2509 -> d
-    50:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2524:2529 -> d
+    43:43:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775 -> d
+    44:48:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2528:2532 -> d
+    49:49:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2530:2530 -> d
+    50:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2550 -> d
     50:55:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
     56:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> d
-    56:56:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2530 -> d
+    56:56:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2551 -> d
     56:56:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    57:59:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2533 -> d
+    57:59:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2554 -> d
     57:59:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    60:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2531 -> d
+    60:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2552 -> d
     60:60:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2524:2524 -> d
+    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2545 -> d
     61:61:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117 -> d
-    62:64:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3378:3380 -> d
-    65:65:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> d
-    65:65:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3381 -> d
-    66:66:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3381:3381 -> d
+    62:64:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3448:3450 -> d
+    65:65:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> d
+    65:65:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3451 -> d
+    66:66:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3451:3451 -> d
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1500(com.android.tools.r8.shaking.Enqueuer):117:117 -> e
     2:2:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> e
     3:5:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1131 -> e
     6:6:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1129 -> e
     7:7:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1278:1278 -> e
-    8:8:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2513:2513 -> e
-    9:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3318:3321 -> e
+    8:8:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> e
+    9:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3388:3391 -> e
     1:1:java.util.Set access$1800(com.android.tools.r8.shaking.Enqueuer):117:117 -> f
     2:2:com.android.tools.r8.shaking.KeepReason lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):529:529 -> f
     3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1105:1105 -> f
@@ -57046,20 +57314,20 @@
     49:49:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
     50:75:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1531:1556 -> f
     50:75:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
-    76:80:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1628:1632 -> f
+    76:80:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1627:1631 -> f
     76:80:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
     81:81:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> f
-    81:81:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1632 -> f
+    81:81:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631 -> f
     81:81:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
-    82:86:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1632:1636 -> f
+    82:86:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> f
     82:86:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1460 -> f
     87:87:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1462:1462 -> f
     1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer):117:117 -> g
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1124:1124 -> g
-    3:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3281:3284 -> g
+    3:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3362:3365 -> g
     1:1:java.util.Set access$2400(com.android.tools.r8.shaking.Enqueuer):117:117 -> h
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1131:1131 -> h
-    3:7:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3273:3277 -> h
+    3:7:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3354:3358 -> h
     1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):117:117 -> i
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1154:1154 -> i
     1:1:com.android.tools.r8.utils.InternalOptions access$2800(com.android.tools.r8.shaking.Enqueuer):117:117 -> j
@@ -57080,80 +57348,97 @@
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
     int[] $SwitchMap$com$android$tools$r8$shaking$EnqueuerWorklist$Action$Kind -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():2239:2239 -> <clinit>
+    1:1:void <clinit>():2261:2261 -> <clinit>
     2:2:void <clinit>():990:990 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):2960:2960 -> <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):2967:2970 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3017:3017 -> <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):3024:3027 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):2980:2994 -> b
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    16:16:boolean addField(com.android.tools.r8.graph.DexField):2994 -> b
-    17:29:boolean addField(com.android.tools.r8.graph.DexField):2994:3006 -> b
-    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3014:3023 -> b
-    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3022:3029 -> b
-    48:49:boolean addType(com.android.tools.r8.graph.DexType):3059:3060 -> b
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3037:3051 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3051 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3051:3063 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3071:3080 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3079:3086 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3116:3117 -> b
 com.android.tools.r8.shaking.Enqueuer$GraphReporter -> com.android.tools.r8.N.u:
     com.android.tools.r8.shaking.Enqueuer this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():3066:3066 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3066:3066 -> <init>
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3069:3075 -> a
-    8:10:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3090:3092 -> a
-    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3080:3085 -> a
-    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3093 -> a
-    17:17:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3096:3096 -> a
-    18:20:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3113:3115 -> a
-    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3101:3106 -> a
-    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3116 -> a
-    27:27:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3119:3119 -> a
-    28:30:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3134:3136 -> a
-    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3124:3129 -> a
-    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3137 -> a
-    37:37:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3140:3140 -> a
-    38:43:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3179:3184 -> a
-    44:49:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3189:3194 -> a
-    50:57:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3198:3205 -> a
-    50:57:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    58:58:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3203:3203 -> a
-    58:58:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    59:59:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3198:3198 -> a
-    59:59:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066 -> a
-    60:66:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3211:3217 -> a
-    60:66:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    67:67:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    67:67:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    68:68:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3211:3211 -> a
-    68:68:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066 -> a
-    69:71:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3223:3225 -> a
-    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3168:3171 -> b
-    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3169:3174 -> b
-    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3145:3146 -> c
+    1:1:void <clinit>():3123:3123 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3123:3123 -> <init>
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3126:3132 -> a
+    8:10:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3147:3149 -> a
+    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3137:3142 -> a
+    11:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3150 -> a
+    17:17:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3153:3153 -> a
+    18:20:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3170:3172 -> a
+    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> a
+    21:26:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3173 -> a
+    27:27:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3176:3176 -> a
+    28:30:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3191:3193 -> a
+    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3181:3186 -> a
+    31:36:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3194 -> a
+    37:37:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3197:3197 -> a
+    38:43:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3236:3241 -> a
+    44:49:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3246:3251 -> a
+    50:53:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3256:3259 -> a
+    54:59:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3257:3262 -> a
+    60:67:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):3267:3274 -> a
+    68:75:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3278:3285 -> a
+    68:75:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    76:76:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3283:3283 -> a
+    76:76:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    77:77:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3278:3278 -> a
+    77:77:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123 -> a
+    78:84:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3291:3297 -> a
+    78:84:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    85:85:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3295:3295 -> a
+    85:85:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    86:86:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3291:3291 -> a
+    86:86:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123 -> a
+    87:89:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3303:3305 -> a
+    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3225:3228 -> b
+    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3226:3231 -> b
+    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3202:3203 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146 -> c
-    4:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146:3150 -> c
-    9:14:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3148:3153 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203 -> c
+    4:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203:3207 -> c
+    9:14:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3205:3210 -> c
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness -> com.android.tools.r8.N.w:
     com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness INSTANCE -> a
     com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness COMPAT_INSTANCE -> b
-    1:2:void <clinit>():3236:3237 -> <clinit>
-    1:1:void <init>():3234:3234 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3234:3234 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3252:3252 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3247:3247 -> b
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3234:3234 -> e
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3234:3234 -> f
+    1:2:void <clinit>():3317:3318 -> <clinit>
+    1:1:void <init>():3315:3315 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3315:3315 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3333:3333 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3328:3328 -> b
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3315:3315 -> e
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3315:3315 -> f
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness$1 -> com.android.tools.r8.N.v:
-    1:1:void <init>():3238:3238 -> <init>
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.x:
+    1:1:void <init>():3319:3319 -> <init>
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.x:
+    com.android.tools.r8.graph.DexClass holder -> a
+    com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> d
+    1:3:void <clinit>():2924:2926 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2935:2938 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> a
+    1:1:boolean isUnresolved():2942 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> b
+    1:2:boolean equals(java.lang.Object):2954:2955 -> equals
+    1:1:int hashCode():2948:2948 -> hashCode
+    2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
+    2:2:int hashCode():2948 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.y:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
@@ -57165,24 +57450,25 @@
     2:2:boolean isInitialOrFinalTreeShaking():134 -> a
     1:1:boolean isInitialTreeShaking():126:126 -> b
     1:1:boolean isTracingMainDex():138:138 -> c
-com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.y:
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.z:
+    java.util.Map methods -> a
+    1:3:void <init>():2959:2961 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2959:2959 -> <init>
+    1:1:java.util.Set getMethods():2964:2964 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2968:2968 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2972 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2974:2979 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2968:2968 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.A:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2885:2885 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2881:2886 -> <init>
-    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2879:2879 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2890:2891 -> a
-    4:4:boolean contains(java.lang.Object):2895:2895 -> a
-    5:5:java.util.Set getItems():2899:2899 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason -> com.android.tools.r8.N.z:
-    java.util.Map reasons -> c
-    1:2:void <init>(java.util.function.BiConsumer,java.util.Map):2913:2914 -> <init>
-    1:1:java.util.function.BiConsumer register(java.util.Map):2918:2918 -> a
-    2:2:void lambda$register$1(java.util.Map,java.lang.Object,com.android.tools.r8.shaking.KeepReason):2919:2919 -> a
-    1:2:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason create():2907:2908 -> b
-    3:3:java.util.Set getReasons(java.lang.Object):2923:2923 -> b
-    1:1:java.util.Set lambda$register$0(java.lang.Object):2919:2919 -> c
-com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.A:
+    1:1:void <init>(java.util.function.BiConsumer):2906:2906 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2902:2907 -> <init>
+    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2900:2900 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2911:2912 -> a
+    4:4:boolean contains(java.lang.Object):2916:2916 -> a
+    5:5:java.util.Set getItems():2920:2920 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.B:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
@@ -57264,14 +57550,14 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):599:599 -> e
     2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1037:1046 -> e
     12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1045:1045 -> e
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.C:
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.D:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.G:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.H:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
@@ -57290,15 +57576,15 @@
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():61:61 -> b
     2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):73:73 -> b
     1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):69:69 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$1 -> com.android.tools.r8.N.D:
-com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.F:
+com.android.tools.r8.shaking.EnqueuerWorklist$1 -> com.android.tools.r8.N.E:
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.G:
     com.android.tools.r8.shaking.KeepReason reason -> d
     com.android.tools.r8.graph.DexItem target -> b
     com.android.tools.r8.graph.DexItem context -> c
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind kind -> a
     1:1:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.EnqueuerWorklist$1):18:18 -> <init>
     2:6:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason):37:41 -> <init>
-com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind -> com.android.tools.r8.N.E:
+com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind -> com.android.tools.r8.N.F:
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_INSTANTIATED -> f
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_METHOD_LIVE -> g
     com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_SUPER -> d
@@ -57313,7 +57599,7 @@
     10:10:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind[] values():20:20 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.H:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.I:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -57332,7 +57618,7 @@
     1:1:boolean isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.I:
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.J:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -57340,7 +57626,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.J:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.K:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -57389,7 +57675,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.N:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.O:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -57431,14 +57717,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.K:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.L:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.L:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.M:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.M:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.N:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -57460,81 +57746,78 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):32:32 -> c
     boolean isInstantiatedIn() -> d
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> d
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.O:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.P:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.P:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Q:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():304:304 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):304:304 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):308:309 -> <init>
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):319:325 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():314:314 -> b
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Q:
+    1:1:void <clinit>():283:283 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):283:283 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):287:288 -> <init>
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):298:304 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():293:293 -> b
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.S:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):95:95 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):99:100 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():106:106 -> e
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.S:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):132:132 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):91:91 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):95:96 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):107:107 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():102:102 -> e
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.T:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):111:111 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):114:114 -> <init>
     com.android.tools.r8.shaking.KeepReason$InstatiatedIn asInstantiatedIn() -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):132:132 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> b
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():129:129 -> b
     boolean isInstantiatedIn() -> d
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():132:132 -> e
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.T:
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():111:111 -> e
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.U:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():193:193 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):193:193 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():202:202 -> b
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.U:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):211:211 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):214:214 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():219:219 -> b
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.V:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):159:159 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):162:162 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():167:167 -> b
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.W:
+    1:1:void <clinit>():172:172 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):172:172 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175:176 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():181:181 -> b
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.V:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):190:190 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):193:193 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():198:198 -> b
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.W:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):138:138 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():146:146 -> b
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.X:
     com.android.tools.r8.graph.DexType implementer -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):269:270 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):281:281 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():276:276 -> b
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.X:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):352:352 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():360:360 -> b
-com.android.tools.r8.shaking.KeepReason$OverridesMethod -> com.android.tools.r8.N.Y:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():123:123 -> b
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.Z:
-    com.android.tools.r8.graph.DexType type -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):245:245 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType):249:250 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):243:243 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):248:249 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):260:260 -> a
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():255:255 -> b
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.Y:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):331:331 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):334:334 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():339:339 -> b
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.Z:
+    com.android.tools.r8.graph.DexType type -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):224:224 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):228:229 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):239:239 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():234:234 -> b
 com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.a0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):228:228 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):231:231 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():236:236 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):207:207 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):210:210 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():215:215 -> b
 com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.b0:
     com.android.tools.r8.graph.DexItem holder -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):285:285 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexItem):289:290 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):300:300 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():295:295 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):268:269 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):279:279 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():274:274 -> b
 com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.c0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):330:330 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):333:333 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():343:343 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():322:322 -> b
     boolean isDueToReflectiveUse() -> c
 com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.d0:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):179:179 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():184:184 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):155:155 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):158:158 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():163:163 -> b
 com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.f0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
@@ -58263,9 +58546,9 @@
     25:32:void parse(java.util.List):177:184 -> a
     33:34:void parse(java.util.List):181:182 -> a
     35:41:void parse(java.util.List):181:187 -> a
-    42:48:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1994:2000 -> a
+    42:48:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2010:2016 -> a
     42:48:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
-    49:49:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1994:1994 -> a
+    49:49:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2010:2010 -> a
     49:49:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
     1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> b
     2:2:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():123:123 -> b
@@ -58283,14 +58566,14 @@
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.b1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):2008:2010 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2014:2014 -> a
-    2:3:boolean hasBackreference():2022:2023 -> a
-    1:15:boolean hasUnusualCharacters():2027:2041 -> b
+    1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
+    2:3:boolean hasBackreference():2038:2039 -> a
+    1:15:boolean hasUnusualCharacters():2043:2057 -> b
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.c1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2052:2054 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.d1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
@@ -58312,535 +58595,535 @@
     java.util.function.Predicate CLASS_NAME_PREDICATE -> i
     1:1:void <clinit>():196:196 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):206:206 -> <init>
-    2:1368:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1565 -> <init>
-    1369:1372:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
+    2:1384:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1581 -> <init>
+    1385:1388:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
     1:4:void parse():216:219 -> a
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464:466 -> a
+    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469:471 -> a
     8:10:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    8:10:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464 -> a
-    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):623:623 -> a
+    8:10:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469 -> a
+    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628:628 -> a
     12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
-    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):624 -> a
+    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):629 -> a
     13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:55 -> a
-    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):625 -> a
-    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):811:812 -> a
-    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):630 -> a
+    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):827:828 -> a
+    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     16:16:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813 -> a
-    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):813:820 -> a
-    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):829 -> a
+    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):829:836 -> a
+    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     25:25:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):821 -> a
-    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):821:823 -> a
-    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):837 -> a
+    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):837:839 -> a
+    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     29:29:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):824 -> a
-    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):824:830 -> a
-    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):459:459 -> a
-    37:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):831 -> a
-    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    38:45:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):834:841 -> a
-    38:45:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    46:46:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):459:459 -> a
-    46:46:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):842 -> a
-    46:46:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    47:52:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):848:853 -> a
-    47:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    47:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):840 -> a
+    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):840:846 -> a
+    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):464:464 -> a
+    37:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):847 -> a
+    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    38:45:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):850:857 -> a
+    38:45:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    46:46:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):464:464 -> a
+    46:46:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858 -> a
+    46:46:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    47:52:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):864:869 -> a
+    47:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    47:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     53:53:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    53:53:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):854 -> a
-    53:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    53:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    54:55:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):854:855 -> a
-    54:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    54:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    53:53:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):870 -> a
+    53:53:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    53:53:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    54:55:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):870:871 -> a
+    54:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    54:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     56:56:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    56:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):856 -> a
-    56:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    56:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    57:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):856:857 -> a
-    57:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    57:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    56:56:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):872 -> a
+    56:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    56:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    57:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):872:873 -> a
+    57:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    57:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     59:59:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858 -> a
-    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    60:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):858:860 -> a
-    60:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    60:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
+    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):874 -> a
+    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    60:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):874:876 -> a
+    60:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    60:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
     63:63:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> a
-    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):861 -> a
-    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):861:862 -> a
-    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    66:67:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1967 -> a
-    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):863 -> a
-    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    68:68:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1966 -> a
-    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):863 -> a
-    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):865:865 -> a
-    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844 -> a
-    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):626 -> a
-    70:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):627:627 -> a
+    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):877 -> a
+    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):877:878 -> a
+    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    66:67:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1983 -> a
+    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):879 -> a
+    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    68:68:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1982 -> a
+    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):879 -> a
+    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):881:881 -> a
+    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):860 -> a
+    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):631 -> a
+    70:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):632:632 -> a
     71:71:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628 -> a
-    72:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628:633 -> a
-    78:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):632:635 -> a
+    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):633 -> a
+    72:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):633:638 -> a
+    78:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):637:640 -> a
     82:82:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):636 -> a
-    83:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):636:639 -> a
+    82:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641 -> a
+    83:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641:644 -> a
     87:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> a
-    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):639 -> a
+    87:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):644 -> a
     88:88:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> a
-    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):640 -> a
-    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):641:641 -> a
-    90:90:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):704:704 -> a
+    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):645 -> a
+    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):646:646 -> a
+    90:90:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):709:709 -> a
     91:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:50 -> a
-    91:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):705 -> a
+    91:91:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):710 -> a
     92:92:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:55 -> a
-    92:92:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):706 -> a
+    92:92:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):711 -> a
     93:93:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
-    93:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):707 -> a
-    94:96:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):708:710 -> a
+    93:93:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):712 -> a
+    94:96:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):713:715 -> a
     97:97:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> a
-    97:97:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):710 -> a
+    97:97:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):715 -> a
     98:98:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> a
-    98:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):711 -> a
+    98:98:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):716 -> a
     99:99:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:44 -> a
-    99:99:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):712 -> a
-    100:105:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):895:900 -> a
-    100:105:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    99:99:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):717 -> a
+    100:105:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):911:916 -> a
+    100:105:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     106:106:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAnnotation():159:159 -> a
-    106:106:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):900 -> a
-    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    107:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):900:900 -> a
-    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    106:106:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):916 -> a
+    106:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    107:107:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):916:916 -> a
+    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     108:108:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):163:163 -> a
-    108:108:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):901 -> a
-    108:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    109:109:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):903:903 -> a
-    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    110:111:boolean parseNegation():888:889 -> a
-    110:111:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):905 -> a
-    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    108:108:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):917 -> a
+    108:108:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    109:109:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):919:919 -> a
+    109:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    110:111:boolean parseNegation():904:905 -> a
+    110:111:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):921 -> a
+    110:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     112:112:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():151:151 -> a
-    112:112:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):906 -> a
-    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
+    112:112:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):922 -> a
+    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
     113:113:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():143:143 -> a
-    113:113:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):907 -> a
-    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    114:123:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):908:917 -> a
-    114:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803 -> a
-    124:126:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):930:932 -> a
-    124:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    113:113:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):923 -> a
+    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    114:123:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):924:933 -> a
+    114:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819 -> a
+    124:126:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):946:948 -> a
+    124:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     127:127:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):139:139 -> a
-    127:127:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):933 -> a
-    127:127:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    128:131:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):935:938 -> a
-    128:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    127:127:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
+    127:127:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    128:131:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):951:954 -> a
+    128:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     132:133:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    132:133:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):938 -> a
-    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    134:134:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940:940 -> a
-    134:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    135:136:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):925:926 -> a
-    135:136:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940 -> a
-    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    132:133:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):954 -> a
+    132:133:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    134:134:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956:956 -> a
+    134:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    135:136:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):941:942 -> a
+    135:136:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956 -> a
+    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     137:139:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    137:139:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):940 -> a
-    137:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    140:141:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):942:943 -> a
-    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    137:139:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):956 -> a
+    137:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    140:141:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):958:959 -> a
+    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     142:143:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    142:143:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):943 -> a
-    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    144:145:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):944:945 -> a
-    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    142:143:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):959 -> a
+    142:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    144:145:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):960:961 -> a
+    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     146:147:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    146:147:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):945 -> a
-    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    148:149:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):946:947 -> a
-    148:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    146:147:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):961 -> a
+    146:147:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    148:149:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):962:963 -> a
+    148:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     150:151:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:131 -> a
-    150:151:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):947 -> a
-    150:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    152:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):805:805 -> a
+    150:151:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963 -> a
+    150:151:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    152:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):821:821 -> a
     153:154:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassNames(com.android.tools.r8.shaking.ProguardClassNameList):121:122 -> a
-    153:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):805 -> a
-    155:156:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):955:956 -> a
-    155:156:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    153:154:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):821 -> a
+    155:156:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):971:972 -> a
+    155:156:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     157:157:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    157:157:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):957 -> a
-    157:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    158:158:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):958:958 -> a
-    158:158:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    157:157:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):973 -> a
+    157:157:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    158:158:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):974:974 -> a
+    158:158:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     159:159:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):93:93 -> a
-    159:159:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):959 -> a
-    159:159:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    160:160:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963:963 -> a
-    160:160:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    159:159:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):975 -> a
+    159:159:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    160:160:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):979:979 -> a
+    160:160:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     161:161:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher):113:113 -> a
-    161:161:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963 -> a
-    161:161:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    162:163:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964:965 -> a
-    162:163:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    164:164:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964:964 -> a
-    164:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
+    161:161:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):979 -> a
+    161:161:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    162:163:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980:981 -> a
+    162:163:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    164:164:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980:980 -> a
+    164:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
     165:165:void com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):105:105 -> a
-    165:165:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964 -> a
-    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):806 -> a
-    166:167:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):974:975 -> a
-    166:167:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    168:170:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):987:989 -> a
-    168:170:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    168:170:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    171:171:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):997:997 -> a
-    171:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    171:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    171:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    172:173:boolean parseNegation():888:889 -> a
-    172:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):999 -> a
-    172:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    172:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    172:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    174:219:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1001:1046 -> a
-    174:219:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    174:219:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    174:219:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    220:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1034:1051 -> a
-    220:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    220:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    220:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    238:243:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1025:1030 -> a
-    238:243:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    238:243:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    238:243:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    244:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1020:1021 -> a
-    244:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    244:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    244:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1015:1016 -> a
-    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1010:1011 -> a
-    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    250:306:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1005:1061 -> a
-    250:306:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):990 -> a
-    250:306:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    250:306:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    307:344:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1069:1106 -> a
-    307:344:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    307:344:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    307:344:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    165:165:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980 -> a
+    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):822 -> a
+    166:167:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):990:991 -> a
+    166:167:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    168:170:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1003:1005 -> a
+    168:170:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    168:170:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    171:171:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1013:1013 -> a
+    171:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    171:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    171:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    172:173:boolean parseNegation():904:905 -> a
+    172:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1015 -> a
+    172:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    172:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    172:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    174:219:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1017:1062 -> a
+    174:219:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    174:219:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    174:219:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    220:237:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1050:1067 -> a
+    220:237:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    220:237:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    220:237:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    238:243:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1041:1046 -> a
+    238:243:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    238:243:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    238:243:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    244:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1036:1037 -> a
+    244:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    244:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    244:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1031:1032 -> a
+    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1026:1027 -> a
+    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    250:306:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1021:1077 -> a
+    250:306:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1006 -> a
+    250:306:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    250:306:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    307:344:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1085:1122 -> a
+    307:344:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    307:344:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    307:344:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     345:345:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():123:123 -> a
-    345:345:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1107 -> a
-    345:345:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    345:345:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    345:345:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    346:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1108:1114 -> a
-    346:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    346:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    346:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    353:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1109:1117 -> a
-    353:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    353:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    353:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    345:345:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1123 -> a
+    345:345:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    345:345:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    345:345:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    346:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1124:1130 -> a
+    346:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    346:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    346:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    353:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1125:1133 -> a
+    353:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    353:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    353:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     362:362:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():123:123 -> a
-    362:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1118 -> a
-    362:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    362:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    362:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    363:369:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1119:1125 -> a
-    363:369:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    363:369:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    363:369:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    370:392:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1120:1142 -> a
-    370:392:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    370:392:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    370:392:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    393:407:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1141:1155 -> a
-    393:407:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    393:407:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    393:407:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    408:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1154:1168 -> a
-    408:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    408:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    408:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    423:428:java.lang.String acceptFieldNameOrIntegerForReturn():1705:1710 -> a
-    423:428:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    423:428:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    423:428:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    423:428:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    429:429:char peekCharAt(int):1503:1503 -> a
-    429:429:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    429:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    429:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    429:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    429:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    430:430:boolean eof(int):1452:1452 -> a
-    430:430:char peekCharAt(int):1503 -> a
-    430:430:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    430:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    430:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    430:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    430:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    431:432:char peekCharAt(int):1503:1504 -> a
-    431:432:java.lang.String acceptFieldNameOrIntegerForReturn():1710 -> a
-    431:432:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    431:432:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    431:432:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    431:432:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    433:445:java.lang.String acceptFieldNameOrIntegerForReturn():1714:1726 -> a
-    433:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1169 -> a
-    433:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    433:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    433:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    446:447:boolean isInteger(java.lang.String):1439:1440 -> a
-    446:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1171 -> a
-    446:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    446:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    446:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    448:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1172:1186 -> a
-    448:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    448:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    448:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185:1185 -> a
-    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    464:476:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1183:1195 -> a
-    464:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    464:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    464:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    477:477:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1194:1194 -> a
-    477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
-    478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1193 -> a
-    478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    478:478:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    479:481:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1196:1198 -> a
-    479:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    479:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    479:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    482:505:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1197:1220 -> a
-    482:505:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):991 -> a
-    482:505:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    482:505:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    506:506:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):992:992 -> a
-    506:506:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):977 -> a
-    506:506:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
+    362:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1134 -> a
+    362:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    362:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    362:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    363:369:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1135:1141 -> a
+    363:369:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    363:369:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    363:369:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    370:392:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1136:1158 -> a
+    370:392:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    370:392:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    370:392:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    393:407:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1157:1171 -> a
+    393:407:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    393:407:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    393:407:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    408:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1170:1184 -> a
+    408:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    408:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    408:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    423:428:java.lang.String acceptFieldNameOrIntegerForReturn():1721:1726 -> a
+    423:428:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    423:428:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    423:428:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    423:428:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    429:429:char peekCharAt(int):1519:1519 -> a
+    429:429:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    429:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    429:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    429:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    429:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    430:430:boolean eof(int):1468:1468 -> a
+    430:430:char peekCharAt(int):1519 -> a
+    430:430:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    430:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    430:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    430:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    430:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    431:432:char peekCharAt(int):1519:1520 -> a
+    431:432:java.lang.String acceptFieldNameOrIntegerForReturn():1726 -> a
+    431:432:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    431:432:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    431:432:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    431:432:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    433:445:java.lang.String acceptFieldNameOrIntegerForReturn():1730:1742 -> a
+    433:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185 -> a
+    433:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    433:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    433:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    446:447:boolean isInteger(java.lang.String):1455:1456 -> a
+    446:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1187 -> a
+    446:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    446:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    446:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    448:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1188:1202 -> a
+    448:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    448:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    448:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1201:1201 -> a
+    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    464:476:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1199:1211 -> a
+    464:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    464:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    464:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    477:477:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1210:1210 -> a
+    477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
+    478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    478:478:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    479:481:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1212:1214 -> a
+    479:481:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    479:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    479:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    482:505:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1213:1236 -> a
+    482:505:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
+    482:505:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    482:505:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    506:506:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1008:1008 -> a
+    506:506:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
+    506:506:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
     507:507:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():80:80 -> a
-    507:507:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):978 -> a
-    507:507:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    508:511:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):978:981 -> a
-    508:511:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):807 -> a
-    512:512:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949:949 -> a
-    512:512:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    513:514:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):925:926 -> a
-    513:514:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
-    513:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
+    507:507:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):994 -> a
+    507:507:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    508:511:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):994:997 -> a
+    508:511:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
+    512:512:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965:965 -> a
+    512:512:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    513:514:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):941:942 -> a
+    513:514:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965 -> a
+    513:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
     515:517:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    515:517:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):949 -> a
-    515:517:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):804 -> a
-    518:527:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1227:1236 -> a
-    528:528:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1233:1233 -> a
-    529:550:java.nio.file.Path parseFileName(boolean):1304:1325 -> a
-    551:551:java.nio.file.Path parseFileName(boolean):1323:1323 -> a
-    552:572:java.lang.String replaceSystemPropertyReferences(java.lang.String):1270:1290 -> a
-    552:572:java.nio.file.Path parseFileName(boolean):1328 -> a
-    573:585:java.lang.String replaceSystemPropertyReferences(java.lang.String):1288:1300 -> a
-    573:585:java.nio.file.Path parseFileName(boolean):1328 -> a
-    586:586:java.nio.file.Path parseFileName(boolean):1330:1330 -> a
-    587:587:java.nio.file.Path parseFileName(boolean):1319:1319 -> a
-    588:588:java.nio.file.Path parseFileName(boolean):1308:1308 -> a
-    589:592:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1314:1317 -> a
-    593:593:boolean eof(int):1452:1452 -> a
-    594:595:boolean acceptChar(char):1474:1475 -> a
-    596:596:int remainingChars():1512:1512 -> a
-    596:596:boolean acceptString(java.lang.String):1522 -> a
-    597:605:boolean acceptString(java.lang.String):1522:1530 -> a
-    606:606:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1540:1540 -> a
-    607:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1578:1583 -> a
-    613:639:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1588:1614 -> a
-    640:641:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609:1610 -> a
+    515:517:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):965 -> a
+    515:517:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):820 -> a
+    518:527:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1243:1252 -> a
+    528:528:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1249:1249 -> a
+    529:550:java.nio.file.Path parseFileName(boolean):1320:1341 -> a
+    551:551:java.nio.file.Path parseFileName(boolean):1339:1339 -> a
+    552:572:java.lang.String replaceSystemPropertyReferences(java.lang.String):1286:1306 -> a
+    552:572:java.nio.file.Path parseFileName(boolean):1344 -> a
+    573:585:java.lang.String replaceSystemPropertyReferences(java.lang.String):1304:1316 -> a
+    573:585:java.nio.file.Path parseFileName(boolean):1344 -> a
+    586:586:java.nio.file.Path parseFileName(boolean):1346:1346 -> a
+    587:587:java.nio.file.Path parseFileName(boolean):1335:1335 -> a
+    588:588:java.nio.file.Path parseFileName(boolean):1324:1324 -> a
+    589:592:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1330:1333 -> a
+    593:593:boolean eof(int):1468:1468 -> a
+    594:595:boolean acceptChar(char):1490:1491 -> a
+    596:596:int remainingChars():1528:1528 -> a
+    596:596:boolean acceptString(java.lang.String):1538 -> a
+    597:605:boolean acceptString(java.lang.String):1538:1546 -> a
+    606:606:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1556:1556 -> a
+    607:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1594:1599 -> a
+    613:639:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1604:1630 -> a
+    640:641:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625:1626 -> a
     642:644:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    642:644:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609 -> a
-    645:647:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617:1619 -> a
+    642:644:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625 -> a
+    645:647:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633:1635 -> a
     648:650:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    648:650:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617 -> a
-    651:657:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1623:1629 -> a
+    648:650:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633 -> a
+    651:657:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1639:1645 -> a
     658:660:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    658:660:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1628 -> a
-    661:704:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1640:1683 -> a
+    658:660:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1644 -> a
+    661:704:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1699 -> a
     705:707:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    705:707:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1679 -> a
-    708:708:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1673:1673 -> a
-    709:736:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1668:1695 -> a
+    705:707:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1695 -> a
+    708:708:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1689:1689 -> a
+    709:736:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1684:1711 -> a
     737:739:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    737:739:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1694 -> a
-    740:741:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1700:1701 -> a
-    742:744:boolean lambda$acceptPattern$7(java.lang.Integer):1757:1759 -> a
-    745:759:java.lang.String acceptString(java.util.function.Predicate):1763:1777 -> a
-    760:762:void parseClassFilter(java.util.function.Consumer):1809:1811 -> a
+    737:739:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1710 -> a
+    740:741:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1716:1717 -> a
+    742:744:boolean lambda$acceptPattern$7(java.lang.Integer):1773:1775 -> a
+    745:759:java.lang.String acceptString(java.util.function.Predicate):1779:1793 -> a
+    760:762:void parseClassFilter(java.util.function.Consumer):1825:1827 -> a
     763:763:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():105:105 -> a
-    763:763:void parseClassFilter(java.util.function.Consumer):1814 -> a
-    764:764:void parseClassFilter(java.util.function.Consumer):1814:1814 -> a
-    765:765:void parseClassFilter(java.util.function.Consumer):1813:1813 -> a
-    766:767:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1942 -> a
-    768:768:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1941 -> a
-    769:770:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1952 -> a
-    771:771:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1951 -> a
-    772:777:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1962 -> a
-    778:778:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> a
-    779:782:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1971:1974 -> a
-    783:784:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1987:1988 -> a
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):500:502 -> b
-    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):501:504 -> b
-    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):595:603 -> b
-    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):505 -> b
-    17:18:void expectChar(char):1516:1517 -> b
-    19:19:boolean lambda$acceptString$3(java.lang.Integer):1535:1535 -> b
-    20:24:java.lang.Integer acceptInteger():1548:1552 -> b
-    25:29:void parsePathFilter(java.util.function.Consumer):1862:1866 -> b
-    30:30:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921:1921 -> b
-    31:40:java.lang.String snippetForPosition():1897:1906 -> b
-    31:40:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921 -> b
-    41:47:java.lang.String snippetForPosition():1902:1908 -> b
-    41:47:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921 -> b
-    48:48:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921:1921 -> b
-    49:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1936:1937 -> b
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):481:488 -> c
-    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):487:487 -> c
-    10:11:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1947 -> c
-    10:11:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):495 -> c
-    12:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1946 -> c
-    12:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):495 -> c
-    13:15:boolean skipFlag(java.lang.String):543:545 -> c
-    16:20:void expectClosingQuote(char):1487:1491 -> c
-    21:21:void expectClosingQuote(char):1489:1489 -> c
-    22:28:boolean lambda$new$5(java.lang.Integer):1557:1563 -> c
-    29:29:java.lang.String acceptPattern():1755:1755 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):470:473 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):472:472 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):578:587 -> d
+    763:763:void parseClassFilter(java.util.function.Consumer):1830 -> a
+    764:764:void parseClassFilter(java.util.function.Consumer):1830:1830 -> a
+    765:765:void parseClassFilter(java.util.function.Consumer):1829:1829 -> a
+    766:767:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1958 -> a
+    768:768:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> a
+    769:770:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1968 -> a
+    771:771:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1967 -> a
+    772:777:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1978 -> a
+    778:778:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1973 -> a
+    779:782:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1987:1990 -> a
+    783:784:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2003:2004 -> a
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):505:507 -> b
+    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):506:509 -> b
+    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):600:608 -> b
+    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):510 -> b
+    17:18:void expectChar(char):1532:1533 -> b
+    19:19:boolean lambda$acceptString$3(java.lang.Integer):1551:1551 -> b
+    20:24:java.lang.Integer acceptInteger():1564:1568 -> b
+    25:29:void parsePathFilter(java.util.function.Consumer):1878:1882 -> b
+    30:30:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937:1937 -> b
+    31:40:java.lang.String snippetForPosition():1913:1922 -> b
+    31:40:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937 -> b
+    41:47:java.lang.String snippetForPosition():1918:1924 -> b
+    41:47:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937 -> b
+    48:48:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937:1937 -> b
+    49:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1952:1953 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):486:493 -> c
+    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):492:492 -> c
+    10:11:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1963 -> c
+    10:11:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):500 -> c
+    12:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1962 -> c
+    12:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):500 -> c
+    13:15:boolean skipFlag(java.lang.String):548:550 -> c
+    16:20:void expectClosingQuote(char):1503:1507 -> c
+    21:21:void expectClosingQuote(char):1505:1505 -> c
+    22:28:boolean lambda$new$5(java.lang.Integer):1573:1579 -> c
+    29:29:java.lang.String acceptPattern():1771:1771 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):475:478 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):477:477 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):583:592 -> d
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> d
-    16:18:boolean skipOptionWithClassSpec(java.lang.String):587 -> d
-    19:22:boolean hasNextChar(char):1456:1459 -> d
-    23:23:char acceptQuoteIfPresent():1483:1483 -> d
-    24:27:boolean hasNextChar(java.util.function.Predicate):1463:1466 -> d
-    24:27:char acceptQuoteIfPresent():1483 -> d
-    28:28:char readChar():1508:1508 -> d
-    28:28:char acceptQuoteIfPresent():1483 -> d
-    29:32:boolean lambda$new$6(java.lang.Integer):1567:1570 -> d
+    16:18:boolean skipOptionWithClassSpec(java.lang.String):592 -> d
+    19:22:boolean hasNextChar(char):1472:1475 -> d
+    23:23:char acceptQuoteIfPresent():1499:1499 -> d
+    24:27:boolean hasNextChar(java.util.function.Predicate):1479:1482 -> d
+    24:27:char acceptQuoteIfPresent():1499 -> d
+    28:28:char readChar():1524:1524 -> d
+    28:28:char acceptQuoteIfPresent():1499 -> d
+    29:32:boolean lambda$new$6(java.lang.Integer):1583:1586 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):564:570 -> e
-    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1372:1373 -> e
-    10:13:java.lang.String acceptQuotedOrUnquotedString():1539:1542 -> e
-    14:17:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1913:1916 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):553:557 -> f
-    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):611:611 -> f
-    7:7:java.lang.String acceptString():1535:1535 -> f
-    1:1:boolean eof():1448:1448 -> g
-    2:5:void unacceptString(java.lang.String):1781:1784 -> g
-    6:6:boolean pathFilterMatcher(java.lang.Integer):1857:1857 -> g
-    1:1:com.android.tools.r8.position.TextPosition getPosition():1979:1979 -> h
-    2:2:int getColumn():1983:1983 -> h
-    2:2:com.android.tools.r8.position.TextPosition getPosition():1979 -> h
-    3:3:com.android.tools.r8.position.TextPosition getPosition():1979:1979 -> h
-    1:1:boolean isOptionalArgumentGiven():1470:1470 -> i
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():870:882 -> j
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():881:881 -> j
-    1:12:java.util.List parseArgumentList():1242:1253 -> k
-    13:22:java.util.List parseArgumentList():1250:1259 -> k
-    23:25:java.util.List parseArgumentList():1258:1260 -> k
-    26:33:java.util.List parseArgumentList():1257:1264 -> k
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1848:1849 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1841 -> l
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1842:1843 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1851:1851 -> l
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1841 -> l
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):569:575 -> e
+    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1388:1389 -> e
+    10:13:java.lang.String acceptQuotedOrUnquotedString():1555:1558 -> e
+    14:17:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1929:1932 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):558:562 -> f
+    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):616:616 -> f
+    7:7:java.lang.String acceptString():1551:1551 -> f
+    1:1:boolean eof():1464:1464 -> g
+    2:5:void unacceptString(java.lang.String):1797:1800 -> g
+    6:6:boolean pathFilterMatcher(java.lang.Integer):1873:1873 -> g
+    1:1:com.android.tools.r8.position.TextPosition getPosition():1995:1995 -> h
+    2:2:int getColumn():1999:1999 -> h
+    2:2:com.android.tools.r8.position.TextPosition getPosition():1995 -> h
+    3:3:com.android.tools.r8.position.TextPosition getPosition():1995:1995 -> h
+    1:1:boolean isOptionalArgumentGiven():1486:1486 -> i
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():886:898 -> j
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():897:897 -> j
+    1:12:java.util.List parseArgumentList():1258:1269 -> k
+    13:22:java.util.List parseArgumentList():1266:1275 -> k
+    23:25:java.util.List parseArgumentList():1274:1276 -> k
+    26:33:java.util.List parseArgumentList():1273:1280 -> k
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1864:1865 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1857 -> l
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1858:1859 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1867:1867 -> l
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1857 -> l
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder com.android.tools.r8.shaking.ProguardClassNameList.builder():24:24 -> m
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1828 -> m
-    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1848:1849 -> m
-    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1820 -> m
-    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1821:1823 -> m
-    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1821:1824 -> m
-    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1831:1832 -> m
-    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1851:1851 -> m
-    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1820 -> m
-    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1830 -> m
-    1:10:java.util.List parseClassPath():1334:1343 -> n
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1349:1362 -> o
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1359:1364 -> o
-    1:7:java.lang.String parseFileFilter():1369:1375 -> p
-    1:10:void parseInclude():509:518 -> q
-    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1931:1932 -> q
-    11:12:void parseInclude():518 -> q
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1844 -> m
+    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1864:1865 -> m
+    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1836 -> m
+    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    4:6:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1837:1839 -> m
+    4:6:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    7:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1837:1840 -> m
+    7:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1847:1848 -> m
+    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1867:1867 -> m
+    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1836 -> m
+    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1846 -> m
+    1:10:java.util.List parseClassPath():1350:1359 -> n
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1365:1378 -> o
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1375:1380 -> o
+    1:7:java.lang.String parseFileFilter():1385:1391 -> p
+    1:10:void parseInclude():514:523 -> q
+    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1947:1948 -> q
+    11:12:void parseInclude():523 -> q
     13:14:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> q
-    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1932 -> q
-    13:14:void parseInclude():518 -> q
-    15:15:void parseInclude():518:518 -> q
-    16:16:void parseInclude():515:515 -> q
-    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1931:1932 -> q
-    17:18:void parseInclude():515 -> q
+    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1948 -> q
+    13:14:void parseInclude():523 -> q
+    15:15:void parseInclude():523:523 -> q
+    16:16:void parseInclude():520:520 -> q
+    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1947:1948 -> q
+    17:18:void parseInclude():520 -> q
     19:20:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> q
-    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1932 -> q
-    19:20:void parseInclude():515 -> q
-    21:21:void parseInclude():515:515 -> q
+    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1948 -> q
+    19:20:void parseInclude():520 -> q
+    21:21:void parseInclude():520:520 -> q
     1:1:boolean parseOption():223:223 -> r
-    2:2:int remainingChars():1512:1512 -> r
-    2:2:boolean acceptArobaseInclude():524 -> r
+    2:2:int remainingChars():1528:1528 -> r
+    2:2:boolean acceptArobaseInclude():529 -> r
     2:2:boolean parseOption():226 -> r
-    3:6:boolean acceptArobaseInclude():527:530 -> r
+    3:6:boolean acceptArobaseInclude():532:535 -> r
     3:6:boolean parseOption():226 -> r
     7:10:boolean parseOption():229:232 -> r
     11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):408:409 -> r
     11:12:boolean parseOption():233 -> r
-    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1395 -> r
+    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1411 -> r
     13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     13:13:boolean parseOption():233 -> r
     14:15:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    14:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395 -> r
+    14:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411 -> r
     14:15:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     14:15:boolean parseOption():233 -> r
-    16:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1395 -> r
+    16:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1411 -> r
     16:16:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     16:16:boolean parseOption():233 -> r
     17:18:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    17:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395 -> r
+    17:18:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411 -> r
     17:18:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     17:18:boolean parseOption():233 -> r
-    19:22:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1398 -> r
+    19:22:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1414 -> r
     19:22:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     19:22:boolean parseOption():233 -> r
     23:23:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    23:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1398 -> r
+    23:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1414 -> r
     23:23:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     23:23:boolean parseOption():233 -> r
     24:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1399 -> r
+    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1415 -> r
     24:24:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     24:24:boolean parseOption():233 -> r
     25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:28 -> r
-    25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1400 -> r
+    25:27:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1416 -> r
     25:27:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):411 -> r
     25:27:boolean parseOption():233 -> r
     28:28:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):412:412 -> r
@@ -58860,33 +59143,33 @@
     36:36:boolean parseOption():233 -> r
     37:37:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):423:423 -> r
     37:37:boolean parseOption():233 -> r
-    38:38:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:755 -> r
+    38:38:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:760 -> r
     38:38:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     38:38:boolean parseOption():233 -> r
     39:40:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    39:40:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755 -> r
+    39:40:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
     39:40:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     39:40:boolean parseOption():233 -> r
-    41:41:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:755 -> r
+    41:41:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:760 -> r
     41:41:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     41:41:boolean parseOption():233 -> r
     42:43:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    42:43:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755 -> r
+    42:43:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
     42:43:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     42:43:boolean parseOption():233 -> r
-    44:47:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:758 -> r
+    44:47:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:763 -> r
     44:47:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     44:47:boolean parseOption():233 -> r
     48:48:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):758 -> r
+    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):763 -> r
     48:48:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     48:48:boolean parseOption():233 -> r
     49:49:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):759 -> r
+    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):764 -> r
     49:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     49:49:boolean parseOption():233 -> r
     50:52:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:28 -> r
-    50:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760 -> r
+    50:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):765 -> r
     50:52:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):424 -> r
     50:52:boolean parseOption():233 -> r
     53:53:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):425:425 -> r
@@ -58896,33 +59179,33 @@
     54:54:boolean parseOption():233 -> r
     55:55:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):428:428 -> r
     55:55:boolean parseOption():233 -> r
-    56:56:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:766 -> r
+    56:56:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:771 -> r
     56:56:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     56:56:boolean parseOption():233 -> r
     57:58:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    57:58:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766 -> r
+    57:58:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
     57:58:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     57:58:boolean parseOption():233 -> r
-    59:59:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:766 -> r
+    59:59:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:771 -> r
     59:59:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     59:59:boolean parseOption():233 -> r
     60:61:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    60:61:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766 -> r
+    60:61:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
     60:61:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     60:61:boolean parseOption():233 -> r
-    62:65:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:769 -> r
+    62:65:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:774 -> r
     62:65:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     62:65:boolean parseOption():233 -> r
     66:66:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    66:66:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):769 -> r
+    66:66:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):774 -> r
     66:66:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     66:66:boolean parseOption():233 -> r
     67:67:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    67:67:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):770 -> r
+    67:67:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):775 -> r
     67:67:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     67:67:boolean parseOption():233 -> r
     68:70:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:28 -> r
-    68:70:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771 -> r
+    68:70:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):776 -> r
     68:70:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):429 -> r
     68:70:boolean parseOption():233 -> r
     71:71:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):430:430 -> r
@@ -58932,40 +59215,40 @@
     72:72:boolean parseOption():233 -> r
     73:74:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):433:434 -> r
     73:74:boolean parseOption():233 -> r
-    75:75:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    75:75:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     75:75:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     75:75:boolean parseOption():233 -> r
     76:77:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    76:77:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    76:77:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     76:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     76:77:boolean parseOption():233 -> r
-    78:78:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    78:78:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     78:78:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     78:78:boolean parseOption():233 -> r
     79:80:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    79:80:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    79:80:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     79:80:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     79:80:boolean parseOption():233 -> r
-    81:81:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:671 -> r
+    81:81:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:676 -> r
     81:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     81:81:boolean parseOption():233 -> r
     82:82:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):31:31 -> r
-    82:82:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671 -> r
+    82:82:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
     82:82:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     82:82:boolean parseOption():233 -> r
-    83:85:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):672:674 -> r
+    83:85:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):677:679 -> r
     83:85:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     83:85:boolean parseOption():233 -> r
     86:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    86:86:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):674 -> r
+    86:86:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):679 -> r
     86:86:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     86:86:boolean parseOption():233 -> r
     87:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    87:87:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):675 -> r
+    87:87:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):680 -> r
     87:87:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     87:87:boolean parseOption():233 -> r
     88:90:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():37:39 -> r
-    88:90:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676 -> r
+    88:90:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):681 -> r
     88:90:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):434 -> r
     88:90:boolean parseOption():233 -> r
     91:91:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435:435 -> r
@@ -58980,40 +59263,40 @@
     96:96:boolean parseOption():233 -> r
     97:98:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):443:444 -> r
     97:98:boolean parseOption():233 -> r
-    99:99:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    99:99:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     99:99:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     99:99:boolean parseOption():233 -> r
     100:101:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    100:101:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    100:101:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     100:101:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     100:101:boolean parseOption():233 -> r
-    102:102:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    102:102:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     102:102:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     102:102:boolean parseOption():233 -> r
     103:104:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    103:104:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    103:104:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     103:104:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     103:104:boolean parseOption():233 -> r
-    105:105:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:682 -> r
+    105:105:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:687 -> r
     105:105:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     105:105:boolean parseOption():233 -> r
     106:106:com.android.tools.r8.shaking.ClassMergingRule$Builder com.android.tools.r8.shaking.ClassMergingRule$Builder.setType(com.android.tools.r8.shaking.ClassMergingRule$Type):31:31 -> r
-    106:106:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682 -> r
+    106:106:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
     106:106:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     106:106:boolean parseOption():233 -> r
-    107:109:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):683:685 -> r
+    107:109:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):688:690 -> r
     107:109:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     107:109:boolean parseOption():233 -> r
     110:110:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    110:110:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):685 -> r
+    110:110:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):690 -> r
     110:110:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     110:110:boolean parseOption():233 -> r
     111:111:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    111:111:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):686 -> r
+    111:111:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):691 -> r
     111:111:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     111:111:boolean parseOption():233 -> r
     112:112:com.android.tools.r8.shaking.ClassMergingRule com.android.tools.r8.shaking.ClassMergingRule$Builder.build():37:37 -> r
-    112:112:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687 -> r
+    112:112:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):692 -> r
     112:112:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):444 -> r
     112:112:boolean parseOption():233 -> r
     113:113:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):445:445 -> r
@@ -59023,40 +59306,40 @@
     114:114:boolean parseOption():233 -> r
     115:116:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448:449 -> r
     115:116:boolean parseOption():233 -> r
-    117:117:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    117:117:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     117:117:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     117:117:boolean parseOption():233 -> r
     118:119:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    118:119:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    118:119:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     118:119:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     118:119:boolean parseOption():233 -> r
-    120:120:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    120:120:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     120:120:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     120:120:boolean parseOption():233 -> r
     121:122:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    121:122:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    121:122:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     121:122:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     121:122:boolean parseOption():233 -> r
-    123:123:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:694 -> r
+    123:123:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:699 -> r
     123:123:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     123:123:boolean parseOption():233 -> r
     124:124:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> r
-    124:124:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694 -> r
+    124:124:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
     124:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     124:124:boolean parseOption():233 -> r
-    125:127:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):695:697 -> r
+    125:127:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):700:702 -> r
     125:127:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     125:127:boolean parseOption():233 -> r
     128:128:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    128:128:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):697 -> r
+    128:128:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):702 -> r
     128:128:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     128:128:boolean parseOption():233 -> r
     129:129:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    129:129:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):698 -> r
+    129:129:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):703 -> r
     129:129:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     129:129:boolean parseOption():233 -> r
     130:130:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:38 -> r
-    130:130:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699 -> r
+    130:130:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):704 -> r
     130:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):450 -> r
     130:130:boolean parseOption():233 -> r
     131:131:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):451:451 -> r
@@ -59064,221 +59347,257 @@
     132:132:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
     132:132:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):451 -> r
     132:132:boolean parseOption():233 -> r
-    133:142:boolean parseOption():234:243 -> r
-    143:162:java.util.List acceptPatternList():1730:1749 -> r
-    143:162:void parseKeepAttributes():535 -> r
-    143:162:boolean parseOption():244 -> r
-    163:166:void parseKeepAttributes():536:539 -> r
-    163:166:boolean parseOption():244 -> r
-    167:167:void parseKeepAttributes():537:537 -> r
-    167:167:boolean parseOption():244 -> r
-    168:169:boolean parseOption():245:246 -> r
-    170:179:void parsePackageFilter(java.util.function.BiConsumer):1790:1799 -> r
-    170:179:boolean parseOption():246 -> r
-    180:183:void parsePackageFilter(java.util.function.BiConsumer):1798:1801 -> r
-    180:183:boolean parseOption():246 -> r
-    184:191:void parsePackageFilter(java.util.function.BiConsumer):1796:1803 -> r
-    184:191:boolean parseOption():246 -> r
-    192:194:boolean parseOption():247:249 -> r
-    195:195:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):658:658 -> r
-    195:195:boolean parseOption():250 -> r
-    196:197:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    196:197:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):659 -> r
-    196:197:boolean parseOption():250 -> r
-    198:198:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):659:659 -> r
-    198:198:boolean parseOption():250 -> r
-    199:200:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    199:200:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):660 -> r
-    199:200:boolean parseOption():250 -> r
-    201:204:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):660:663 -> r
-    201:204:boolean parseOption():250 -> r
-    205:205:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    205:205:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):663 -> r
-    205:205:boolean parseOption():250 -> r
-    206:206:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    206:206:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664 -> r
-    206:206:boolean parseOption():250 -> r
-    207:207:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665:665 -> r
-    207:207:boolean parseOption():250 -> r
-    208:208:boolean parseOption():251:251 -> r
-    209:209:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    209:209:boolean parseOption():251 -> r
-    210:215:boolean parseOption():252:257 -> r
-    216:216:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    216:216:boolean parseOption():257 -> r
-    217:217:boolean parseOption():258:258 -> r
-    218:218:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):646:646 -> r
-    218:218:boolean parseOption():259 -> r
-    219:220:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    219:220:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):647 -> r
-    219:220:boolean parseOption():259 -> r
-    221:221:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):647:647 -> r
-    221:221:boolean parseOption():259 -> r
-    222:223:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    222:223:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):648 -> r
-    222:223:boolean parseOption():259 -> r
-    224:227:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):648:651 -> r
-    224:227:boolean parseOption():259 -> r
-    228:228:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    228:228:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):651 -> r
-    228:228:boolean parseOption():259 -> r
-    229:229:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    229:229:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652 -> r
-    229:229:boolean parseOption():259 -> r
-    230:230:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> r
-    230:230:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653 -> r
-    230:230:boolean parseOption():259 -> r
-    231:231:boolean parseOption():260:260 -> r
-    232:232:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    232:232:boolean parseOption():260 -> r
-    233:242:boolean parseOption():261:270 -> r
-    243:244:boolean parseOption():267:268 -> r
-    245:247:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    245:247:boolean parseOption():267 -> r
-    248:321:boolean parseOption():271:344 -> r
-    322:322:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1382:1382 -> r
-    322:322:boolean parseOption():345 -> r
-    323:324:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    323:324:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1383 -> r
-    323:324:boolean parseOption():345 -> r
-    325:325:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1383:1383 -> r
-    325:325:boolean parseOption():345 -> r
-    326:327:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    326:327:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1384 -> r
-    326:327:boolean parseOption():345 -> r
-    328:331:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1384:1387 -> r
-    328:331:boolean parseOption():345 -> r
-    332:332:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    332:332:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1387 -> r
-    332:332:boolean parseOption():345 -> r
-    333:333:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    333:333:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1388 -> r
-    333:333:boolean parseOption():345 -> r
-    334:334:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1389:1389 -> r
-    334:334:boolean parseOption():345 -> r
-    335:335:boolean parseOption():346:346 -> r
-    336:336:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    336:336:boolean parseOption():346 -> r
-    337:337:boolean parseOption():347:347 -> r
-    338:338:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1405:1405 -> r
-    338:338:boolean parseOption():348 -> r
-    339:340:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    339:340:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1406 -> r
-    339:340:boolean parseOption():348 -> r
-    341:341:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1406:1406 -> r
-    341:341:boolean parseOption():348 -> r
-    342:343:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    342:343:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1407 -> r
-    342:343:boolean parseOption():348 -> r
-    344:347:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1407:1410 -> r
-    344:347:boolean parseOption():348 -> r
-    348:348:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    348:348:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1410 -> r
-    348:348:boolean parseOption():348 -> r
-    349:349:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    349:349:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1411 -> r
-    349:349:boolean parseOption():348 -> r
-    350:350:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:26 -> r
-    350:350:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1412 -> r
-    350:350:boolean parseOption():348 -> r
-    351:351:boolean parseOption():349:349 -> r
-    352:352:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    352:352:boolean parseOption():349 -> r
-    353:356:boolean parseOption():350:353 -> r
-    357:383:boolean parseOption():352:378 -> r
-    384:384:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    384:384:boolean parseOption():378 -> r
-    385:392:boolean parseOption():379:386 -> r
-    393:393:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):718:718 -> r
-    393:393:boolean parseOption():386 -> r
-    394:395:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    394:395:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):719 -> r
-    394:395:boolean parseOption():386 -> r
-    396:396:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):719:719 -> r
-    396:396:boolean parseOption():386 -> r
-    397:398:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    397:398:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):720 -> r
-    397:398:boolean parseOption():386 -> r
-    399:402:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):720:723 -> r
-    399:402:boolean parseOption():386 -> r
-    403:403:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    403:403:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):723 -> r
-    403:403:boolean parseOption():386 -> r
-    404:404:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    404:404:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724 -> r
-    404:404:boolean parseOption():386 -> r
-    405:405:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> r
-    405:405:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725 -> r
-    405:405:boolean parseOption():386 -> r
-    406:406:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    406:406:boolean parseOption():386 -> r
-    407:408:boolean parseOption():387:388 -> r
-    409:409:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):730:730 -> r
-    409:409:boolean parseOption():388 -> r
-    410:411:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
-    410:411:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):731 -> r
-    410:411:boolean parseOption():388 -> r
-    412:412:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):731:731 -> r
-    412:412:boolean parseOption():388 -> r
-    413:414:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
-    413:414:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):732 -> r
-    413:414:boolean parseOption():388 -> r
-    415:422:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):732:739 -> r
-    415:422:boolean parseOption():388 -> r
-    423:423:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):47:47 -> r
-    423:423:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):740 -> r
-    423:423:boolean parseOption():388 -> r
-    424:425:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):741:742 -> r
-    424:425:boolean parseOption():388 -> r
-    426:426:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
-    426:426:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):742 -> r
-    426:426:boolean parseOption():388 -> r
-    427:427:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
-    427:427:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):743 -> r
+    133:133:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):454:454 -> r
+    133:133:boolean parseOption():233 -> r
+    134:134:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:782 -> r
+    134:134:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    134:134:boolean parseOption():233 -> r
+    135:136:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    135:136:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782 -> r
+    135:136:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    135:136:boolean parseOption():233 -> r
+    137:137:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:782 -> r
+    137:137:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    137:137:boolean parseOption():233 -> r
+    138:139:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    138:139:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782 -> r
+    138:139:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    138:139:boolean parseOption():233 -> r
+    140:143:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:785 -> r
+    140:143:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    140:143:boolean parseOption():233 -> r
+    144:144:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    144:144:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):785 -> r
+    144:144:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    144:144:boolean parseOption():233 -> r
+    145:145:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    145:145:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):786 -> r
+    145:145:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    145:145:boolean parseOption():233 -> r
+    146:148:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:28 -> r
+    146:148:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):787 -> r
+    146:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):455 -> r
+    146:148:boolean parseOption():233 -> r
+    149:149:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):456:456 -> r
+    149:149:boolean parseOption():233 -> r
+    150:150:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    150:150:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):456 -> r
+    150:150:boolean parseOption():233 -> r
+    151:160:boolean parseOption():234:243 -> r
+    161:180:java.util.List acceptPatternList():1746:1765 -> r
+    161:180:void parseKeepAttributes():540 -> r
+    161:180:boolean parseOption():244 -> r
+    181:184:void parseKeepAttributes():541:544 -> r
+    181:184:boolean parseOption():244 -> r
+    185:185:void parseKeepAttributes():542:542 -> r
+    185:185:boolean parseOption():244 -> r
+    186:187:boolean parseOption():245:246 -> r
+    188:197:void parsePackageFilter(java.util.function.BiConsumer):1806:1815 -> r
+    188:197:boolean parseOption():246 -> r
+    198:201:void parsePackageFilter(java.util.function.BiConsumer):1814:1817 -> r
+    198:201:boolean parseOption():246 -> r
+    202:209:void parsePackageFilter(java.util.function.BiConsumer):1812:1819 -> r
+    202:209:boolean parseOption():246 -> r
+    210:212:boolean parseOption():247:249 -> r
+    213:213:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):663:663 -> r
+    213:213:boolean parseOption():250 -> r
+    214:215:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    214:215:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664 -> r
+    214:215:boolean parseOption():250 -> r
+    216:216:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):664:664 -> r
+    216:216:boolean parseOption():250 -> r
+    217:218:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    217:218:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665 -> r
+    217:218:boolean parseOption():250 -> r
+    219:222:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):665:668 -> r
+    219:222:boolean parseOption():250 -> r
+    223:223:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    223:223:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):668 -> r
+    223:223:boolean parseOption():250 -> r
+    224:224:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    224:224:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):669 -> r
+    224:224:boolean parseOption():250 -> r
+    225:225:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):670:670 -> r
+    225:225:boolean parseOption():250 -> r
+    226:226:boolean parseOption():251:251 -> r
+    227:227:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    227:227:boolean parseOption():251 -> r
+    228:233:boolean parseOption():252:257 -> r
+    234:234:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    234:234:boolean parseOption():257 -> r
+    235:235:boolean parseOption():258:258 -> r
+    236:236:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):651:651 -> r
+    236:236:boolean parseOption():259 -> r
+    237:238:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    237:238:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652 -> r
+    237:238:boolean parseOption():259 -> r
+    239:239:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):652:652 -> r
+    239:239:boolean parseOption():259 -> r
+    240:241:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    240:241:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653 -> r
+    240:241:boolean parseOption():259 -> r
+    242:245:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):653:656 -> r
+    242:245:boolean parseOption():259 -> r
+    246:246:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    246:246:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):656 -> r
+    246:246:boolean parseOption():259 -> r
+    247:247:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    247:247:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):657 -> r
+    247:247:boolean parseOption():259 -> r
+    248:248:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:26 -> r
+    248:248:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):658 -> r
+    248:248:boolean parseOption():259 -> r
+    249:249:boolean parseOption():260:260 -> r
+    250:250:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    250:250:boolean parseOption():260 -> r
+    251:260:boolean parseOption():261:270 -> r
+    261:262:boolean parseOption():267:268 -> r
+    263:265:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    263:265:boolean parseOption():267 -> r
+    266:339:boolean parseOption():271:344 -> r
+    340:340:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1398:1398 -> r
+    340:340:boolean parseOption():345 -> r
+    341:342:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    341:342:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1399 -> r
+    341:342:boolean parseOption():345 -> r
+    343:343:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1399:1399 -> r
+    343:343:boolean parseOption():345 -> r
+    344:345:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    344:345:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1400 -> r
+    344:345:boolean parseOption():345 -> r
+    346:349:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1400:1403 -> r
+    346:349:boolean parseOption():345 -> r
+    350:350:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    350:350:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1403 -> r
+    350:350:boolean parseOption():345 -> r
+    351:351:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    351:351:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1404 -> r
+    351:351:boolean parseOption():345 -> r
+    352:352:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1405:1405 -> r
+    352:352:boolean parseOption():345 -> r
+    353:353:boolean parseOption():346:346 -> r
+    354:354:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    354:354:boolean parseOption():346 -> r
+    355:355:boolean parseOption():347:347 -> r
+    356:356:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1421:1421 -> r
+    356:356:boolean parseOption():348 -> r
+    357:358:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    357:358:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1422 -> r
+    357:358:boolean parseOption():348 -> r
+    359:359:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1422:1422 -> r
+    359:359:boolean parseOption():348 -> r
+    360:361:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    360:361:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1423 -> r
+    360:361:boolean parseOption():348 -> r
+    362:365:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1423:1426 -> r
+    362:365:boolean parseOption():348 -> r
+    366:366:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    366:366:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1426 -> r
+    366:366:boolean parseOption():348 -> r
+    367:367:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    367:367:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1427 -> r
+    367:367:boolean parseOption():348 -> r
+    368:368:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:26 -> r
+    368:368:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1428 -> r
+    368:368:boolean parseOption():348 -> r
+    369:369:boolean parseOption():349:349 -> r
+    370:370:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    370:370:boolean parseOption():349 -> r
+    371:374:boolean parseOption():350:353 -> r
+    375:401:boolean parseOption():352:378 -> r
+    402:402:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    402:402:boolean parseOption():378 -> r
+    403:410:boolean parseOption():379:386 -> r
+    411:411:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):723:723 -> r
+    411:411:boolean parseOption():386 -> r
+    412:413:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    412:413:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724 -> r
+    412:413:boolean parseOption():386 -> r
+    414:414:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):724:724 -> r
+    414:414:boolean parseOption():386 -> r
+    415:416:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    415:416:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725 -> r
+    415:416:boolean parseOption():386 -> r
+    417:420:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):725:728 -> r
+    417:420:boolean parseOption():386 -> r
+    421:421:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    421:421:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):728 -> r
+    421:421:boolean parseOption():386 -> r
+    422:422:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    422:422:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):729 -> r
+    422:422:boolean parseOption():386 -> r
+    423:423:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:25 -> r
+    423:423:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):730 -> r
+    423:423:boolean parseOption():386 -> r
+    424:424:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    424:424:boolean parseOption():386 -> r
+    425:426:boolean parseOption():387:388 -> r
+    427:427:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):735:735 -> r
     427:427:boolean parseOption():388 -> r
-    428:431:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():52:55 -> r
-    428:431:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):744 -> r
-    428:431:boolean parseOption():388 -> r
-    432:432:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745:745 -> r
-    432:432:boolean parseOption():388 -> r
-    433:445:void verifyAndLinkBackReferences(java.lang.Iterable):775:787 -> r
-    433:445:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    433:445:boolean parseOption():388 -> r
-    446:446:void com.android.tools.r8.shaking.ProguardWildcard$BackReference.setReference(com.android.tools.r8.shaking.ProguardWildcard$Pattern):90:90 -> r
-    446:446:void verifyAndLinkBackReferences(java.lang.Iterable):787 -> r
-    446:446:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    446:446:boolean parseOption():388 -> r
-    447:450:void verifyAndLinkBackReferences(java.lang.Iterable):782:785 -> r
-    447:450:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    447:450:boolean parseOption():388 -> r
-    451:453:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    451:453:void verifyAndLinkBackReferences(java.lang.Iterable):782 -> r
-    451:453:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    451:453:boolean parseOption():388 -> r
-    454:456:void verifyAndLinkBackReferences(java.lang.Iterable):789:791 -> r
-    454:456:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
-    454:456:boolean parseOption():388 -> r
-    457:457:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
-    457:457:boolean parseOption():388 -> r
-    458:459:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748:749 -> r
-    458:459:boolean parseOption():388 -> r
-    460:462:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
-    460:462:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748 -> r
-    460:462:boolean parseOption():388 -> r
-    463:475:boolean parseOption():389:401 -> r
-    1:1:java.lang.String acceptClassName():1573:1573 -> s
-    1:1:java.lang.String parsePackageNameOrEmptyString():1836 -> s
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1871:1890 -> t
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1892 -> t
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1877:1877 -> t
-    1:1:char peekChar():1499:1499 -> u
-    1:4:void skipOptimizationName():608:611 -> v
-    1:2:void skipSingleArgument():615:616 -> w
-    3:3:char readChar():1508:1508 -> w
-    3:3:void skipSingleArgument():617 -> w
-    1:6:void skipWhitespace():1416:1421 -> x
-    7:14:void skipComment():1427:1434 -> x
-    7:14:void skipWhitespace():1423 -> x
+    428:429:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):50:51 -> r
+    428:429:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):736 -> r
+    428:429:boolean parseOption():388 -> r
+    430:430:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):736:736 -> r
+    430:430:boolean parseOption():388 -> r
+    431:432:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):55:56 -> r
+    431:432:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):737 -> r
+    431:432:boolean parseOption():388 -> r
+    433:440:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):737:744 -> r
+    433:440:boolean parseOption():388 -> r
+    441:441:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):47:47 -> r
+    441:441:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):745 -> r
+    441:441:boolean parseOption():388 -> r
+    442:443:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):746:747 -> r
+    442:443:boolean parseOption():388 -> r
+    444:444:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setSource(java.lang.String):65:65 -> r
+    444:444:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):747 -> r
+    444:444:boolean parseOption():388 -> r
+    445:445:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):60:60 -> r
+    445:445:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748 -> r
+    445:445:boolean parseOption():388 -> r
+    446:449:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():52:55 -> r
+    446:449:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):749 -> r
+    446:449:boolean parseOption():388 -> r
+    450:450:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750:750 -> r
+    450:450:boolean parseOption():388 -> r
+    451:463:void verifyAndLinkBackReferences(java.lang.Iterable):791:803 -> r
+    451:463:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    451:463:boolean parseOption():388 -> r
+    464:464:void com.android.tools.r8.shaking.ProguardWildcard$BackReference.setReference(com.android.tools.r8.shaking.ProguardWildcard$Pattern):90:90 -> r
+    464:464:void verifyAndLinkBackReferences(java.lang.Iterable):803 -> r
+    464:464:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    464:464:boolean parseOption():388 -> r
+    465:468:void verifyAndLinkBackReferences(java.lang.Iterable):798:801 -> r
+    465:468:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    465:468:boolean parseOption():388 -> r
+    469:471:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    469:471:void verifyAndLinkBackReferences(java.lang.Iterable):798 -> r
+    469:471:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    469:471:boolean parseOption():388 -> r
+    472:474:void verifyAndLinkBackReferences(java.lang.Iterable):805:807 -> r
+    472:474:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):750 -> r
+    472:474:boolean parseOption():388 -> r
+    475:475:void com.android.tools.r8.shaking.ProguardConfiguration$Builder.addRule(com.android.tools.r8.shaking.ProguardConfigurationRule):188:188 -> r
+    475:475:boolean parseOption():388 -> r
+    476:477:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):753:754 -> r
+    476:477:boolean parseOption():388 -> r
+    478:480:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> r
+    478:480:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):753 -> r
+    478:480:boolean parseOption():388 -> r
+    481:493:boolean parseOption():389:401 -> r
+    1:1:java.lang.String acceptClassName():1589:1589 -> s
+    1:1:java.lang.String parsePackageNameOrEmptyString():1852 -> s
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1906 -> t
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1903:1908 -> t
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1893:1893 -> t
+    1:1:char peekChar():1515:1515 -> u
+    1:4:void skipOptimizationName():613:616 -> v
+    1:2:void skipSingleArgument():620:621 -> w
+    3:3:char readChar():1524:1524 -> w
+    3:3:void skipSingleArgument():622 -> w
+    1:6:void skipWhitespace():1432:1437 -> x
+    7:14:void skipComment():1443:1450 -> x
+    7:14:void skipWhitespace():1439 -> x
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.g1:
     boolean used -> o
     boolean $assertionsDisabled -> p
@@ -59335,7 +59654,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -59352,7 +59671,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -59741,7 +60060,7 @@
     1:1:boolean access$100(java.lang.String,int,java.lang.String,int,java.util.List,int):14:14 -> a
     2:2:java.lang.Iterable getWildcards():93:93 -> a
     3:3:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2018:2018 -> a
+    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2034:2034 -> a
     4:4:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
     5:9:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
     com.android.tools.r8.shaking.ProguardNameMatcher materialize() -> b
@@ -59884,7 +60203,7 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
@@ -59982,7 +60301,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60046,173 +60365,176 @@
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
 com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.v2:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Map mayHaveSideEffects -> s
-    java.util.Set ifRules -> y
+    java.util.Set identifierNameStrings -> w
+    java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> y
     java.lang.Iterable rules -> c
     java.util.LinkedHashMap reasonAsked -> g
-    java.util.Map assumedValues -> u
+    java.util.Map noSideEffects -> u
     com.android.tools.r8.graph.DirectMappedDexApplication application -> b
     java.util.Set alwaysInline -> i
     java.util.Set noOptimization -> e
-    java.util.Set neverMerge -> o
-    com.android.tools.r8.utils.InternalOptions options -> w
+    java.util.Set neverClassInline -> o
+    java.util.Set neverPropagateValue -> q
+    boolean $assertionsDisabled -> A
     java.util.Set neverInline -> k
-    java.util.Set keepUnusedArguments -> m
-    java.util.Map dependentKeepClassCompatRule -> r
-    java.util.Map noSideEffects -> t
-    java.util.Set identifierNameStrings -> v
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> x
+    java.util.Set keepParametersWithConstantValue -> m
+    java.util.Map dependentNoShrinking -> r
+    java.util.Map mayHaveSideEffects -> t
+    java.util.Set ifRules -> z
     java.util.LinkedHashMap checkDiscarded -> h
+    java.util.Map assumedValues -> v
     java.util.Map noShrinking -> d
     java.util.Set forceInline -> j
-    boolean $assertionsDisabled -> z
     java.util.Set noObfuscation -> f
-    java.util.Set neverPropagateValue -> p
-    java.util.Set keepParametersWithConstantValue -> l
-    java.util.Set neverClassInline -> n
+    java.util.Set neverMerge -> p
+    com.android.tools.r8.utils.InternalOptions options -> x
+    java.util.Set whyAreYouNotInlining -> l
+    java.util.Set keepUnusedArguments -> n
     1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):96:96 -> <init>
-    2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:100 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):97:97 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:101 -> <init>
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
-    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:243 -> a
-    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):242:242 -> a
-    18:23:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):246:251 -> a
-    24:51:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):258:285 -> a
-    52:52:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):274:274 -> a
-    53:64:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):304:315 -> a
-    65:96:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):325:356 -> a
-    97:97:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():361:361 -> a
-    98:107:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):378:387 -> a
-    108:109: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):411:412 -> a
-    110:134: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):434:458 -> a
-    135:136: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):470:471 -> a
-    137:145: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):483:491 -> a
-    146:146: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):501:501 -> a
-    147:148: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):503:504 -> a
-    149:150:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):566:567 -> a
-    151:151:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583:583 -> a
-    151:151:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    152:161:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):593:602 -> a
-    152:161:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    152:161:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    162:162:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> a
-    162:162:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):602 -> a
-    162:162:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    162:162:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    163:163:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):605:605 -> a
-    163:163:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583 -> a
-    163:163:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    164:164:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):588:588 -> a
-    164:164:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575 -> a
-    165:170:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):611:616 -> a
-    165:170:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):579 -> a
-    171:176:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):657:662 -> a
-    177:177:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):661:661 -> a
-    178:178:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):667:667 -> a
-    179:182:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):680:683 -> a
-    179:182:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):668 -> a
-    183:183:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):698:698 -> a
-    184:184:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():18:18 -> a
-    184:184:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):698 -> a
-    185:186:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):699:700 -> a
-    187:191:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):713:717 -> a
-    192:192:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):725:725 -> a
-    193:197:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):733:737 -> a
-    198:205: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):752:759 -> a
-    206:206:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    206:206: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):759 -> a
-    207:209: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):763:765 -> a
-    210:213: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):776:779 -> a
-    214:214:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    214:214: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):779 -> a
-    215:215: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):782:782 -> a
-    216:216:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):788:788 -> a
-    217:217:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    217:217:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):789 -> a
-    218:218:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):791:791 -> a
-    219:238:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):795:814 -> a
-    239:240:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():814:815 -> a
-    239:240:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):511 -> a
-    241:252:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):511:522 -> a
-    253:253:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    253:253:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):524 -> a
-    254:254:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):524:524 -> a
-    255:280:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):519:544 -> a
-    281:281:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    281:281:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):544 -> a
-    282:282:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):544:544 -> a
-    283:298:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):543:558 -> a
-    299:319: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):838:858 -> a
-    320:320:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    320:320: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):858 -> a
-    321:330:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):864:873 -> a
-    331:352:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):870:891 -> a
-    353:353:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    353:353: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):891 -> a
-    354:378: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):891:915 -> a
-    379:389:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):818:828 -> a
-    379:389: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):916 -> a
-    390:420: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):917:947 -> a
-    421:421: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):941:941 -> a
-    422:445: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):938:961 -> a
-    446:459:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:972 -> a
-    460:504: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):970:1014 -> a
-    505:505:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):891:891 -> a
-    506:506:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):899:899 -> a
-    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):159:159 -> b
-    2:25: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):399:422 -> b
-    26:27: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):419:420 -> b
-    28:29: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):455:456 -> b
-    30:30: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):468:468 -> b
-    31:32: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):488:489 -> b
-    33:33:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):562:562 -> b
-    33:33:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):113 -> b
-    34:34:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):116:116 -> b
-    35:35:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571:571 -> b
-    35:35:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> b
-    36:36:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    36:36:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571 -> b
-    36:36:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):119 -> b
-    37:81:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):127:171 -> b
-    82:82:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):148:148 -> b
-    83:160:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):141:218 -> b
-    161:161:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):207:207 -> b
-    162:164:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196:198 -> b
-    165:167:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> b
-    168:168:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):178:178 -> b
-    169:169:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571:571 -> b
-    170:170:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    170:170:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571 -> b
-    171:181:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):625:635 -> b
-    182:182:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> b
-    182:182:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):635 -> b
-    183:195:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):638:650 -> b
-    196:196:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):687:687 -> b
-    197:197:boolean com.android.tools.r8.shaking.ProguardMemberType.includesMethods():22:22 -> b
-    197:197:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):687 -> b
-    198:199:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):688:689 -> b
-    200:200:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):900:900 -> b
+    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230:245 -> a
+    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):244:244 -> a
+    18:23:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):248:253 -> a
+    24:47:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):260:283 -> a
+    48:56:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):282:290 -> a
+    57:57:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):276:276 -> a
+    58:69:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):310:321 -> a
+    70:101:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):331:362 -> a
+    102:102:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():367:367 -> a
+    103:112:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):384:393 -> a
+    113:114: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):417:418 -> a
+    115:139: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):440:464 -> a
+    140:141: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):476:477 -> a
+    142:150:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):489:497 -> a
+    151:151: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):507:507 -> a
+    152:153: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):509:510 -> a
+    154:155:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):572:573 -> a
+    156:156:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589:589 -> a
+    156:156:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    157:166:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):599:608 -> a
+    157:166:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    157:166:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    167:167:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> a
+    167:167:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):608 -> a
+    167:167:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    167:167:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    168:168:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):611:611 -> a
+    168:168:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589 -> a
+    168:168:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    169:169:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):594:594 -> a
+    169:169:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581 -> a
+    170:175:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):617:622 -> a
+    170:175:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):585 -> a
+    176:181:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):663:668 -> a
+    182:182:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):667:667 -> a
+    183:183:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):673:673 -> a
+    184:187:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):686:689 -> a
+    184:187:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):674 -> a
+    188:188:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):704:704 -> a
+    189:189:boolean com.android.tools.r8.shaking.ProguardMemberType.includesFields():18:18 -> a
+    189:189:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):704 -> a
+    190:191:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):705:706 -> a
+    192:196:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):719:723 -> a
+    197:197:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):731:731 -> a
+    198:202:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):739:743 -> a
+    203:209:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):758:764 -> a
+    210:210:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    210:210:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):765 -> a
+    211:213:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):769:771 -> a
+    214:217: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):782:785 -> a
+    218:218:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    218:218: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):785 -> a
+    219:219: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):788:788 -> a
+    220:220:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):794:794 -> a
+    221:221:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    221:221:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):795 -> a
+    222:222:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):797:797 -> a
+    223:242:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):801:820 -> a
+    243:244:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():824:825 -> a
+    243:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
+    245:256:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    257:257:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
+    258:258:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
+    259:284:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
+    285:285:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    285:285:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
+    286:286:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
+    287:302:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    303:323:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):844:864 -> a
+    324:324:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    324:324:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):864 -> a
+    325:334:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):870:879 -> a
+    335:356:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):876:897 -> a
+    357:357:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    357:357:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):897 -> a
+    358:382:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):897:921 -> a
+    383:393:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
+    383:393:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):922 -> a
+    394:424:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):923:953 -> a
+    425:425:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):947:947 -> a
+    426:444:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):944:962 -> a
+    445:459:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:973 -> a
+    460:473:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):971:984 -> a
+    474:518:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):982:1026 -> a
+    519:519:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):897:897 -> a
+    520:520:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):905:905 -> a
+    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):160:160 -> b
+    2:25:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):405:428 -> b
+    26:27: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):425:426 -> b
+    28:29: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):461:462 -> b
+    30:30: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):474:474 -> b
+    31:32: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):494:495 -> b
+    33:33:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):568:568 -> b
+    33:33:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):114 -> b
+    34:34:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):117:117 -> b
+    35:35:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577:577 -> b
+    35:35:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):120 -> b
+    36:36:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    36:36:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577 -> b
+    36:36:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):120 -> b
+    37:81:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):128:172 -> b
+    82:82:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149:149 -> b
+    83:161:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):142:220 -> b
+    162:162:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):209:209 -> b
+    163:165:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> b
+    166:168:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):198:200 -> b
+    169:169:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):179:179 -> b
+    170:170:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577:577 -> b
+    171:171:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    171:171:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577 -> b
+    172:182:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):631:641 -> b
+    183:183:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> b
+    183:183:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):641 -> b
+    184:196:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):644:656 -> b
+    197:197:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):693:693 -> b
+    198:198:boolean com.android.tools.r8.shaking.ProguardMemberType.includesMethods():22:22 -> b
+    198:198:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):693 -> b
+    199:200:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):694:695 -> b
+    201:201:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):906:906 -> b
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
-    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):562:562 -> c
-    2:2:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):903:903 -> c
+    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):568:568 -> c
+    2:2:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):909:909 -> c
     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):810:810 -> f
-    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):811:811 -> g
+    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
+    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
 com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.t2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> e
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
-    1:1:void <clinit>():974:974 -> <clinit>
-    2:2:void <clinit>():963:963 -> <clinit>
-    3:3:void <clinit>():952:952 -> <clinit>
-    4:4:void <clinit>():936:936 -> <clinit>
-    5:5:void <clinit>():138:138 -> <clinit>
+    1:1:void <clinit>():986:986 -> <clinit>
+    2:2:void <clinit>():975:975 -> <clinit>
+    3:3:void <clinit>():964:964 -> <clinit>
+    4:4:void <clinit>():942:942 -> <clinit>
+    5:5:void <clinit>():139:139 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.u2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
@@ -60221,94 +60543,95 @@
     java.util.Set neverClassInline -> b
     java.util.Map dependentNoShrinking -> f
     java.util.Map dependentKeepClassCompatRule -> g
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1395:1395 -> <init>
-    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1411:1418 -> <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,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
+    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.v2$a:
-    java.util.Map dependentNoShrinking -> q
-    java.util.Map dependentKeepClassCompatRule -> r
-    java.util.Set identifierNameStrings -> s
-    java.util.Map mayHaveSideEffects -> n
-    java.util.Set ifRules -> t
-    java.util.Map noSideEffects -> o
-    java.util.Map assumedValues -> p
-    boolean $assertionsDisabled -> u
+    java.util.Map assumedValues -> q
+    java.util.Map dependentNoShrinking -> r
+    java.util.Map dependentKeepClassCompatRule -> s
+    java.util.Set identifierNameStrings -> t
+    java.util.Map mayHaveSideEffects -> o
+    java.util.Set ifRules -> u
+    java.util.Map noSideEffects -> p
+    boolean $assertionsDisabled -> v
     com.android.tools.r8.com.google.common.collect.ImmutableList checkDiscarded -> e
     java.util.Set noOptimization -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> d
     java.util.Map noShrinking -> a
     java.util.Set forceInline -> g
     java.util.Set neverInline -> h
-    java.util.Set keepConstantArguments -> i
-    java.util.Set keepUnusedArguments -> j
+    java.util.Set whyAreYouNotInlining -> i
+    java.util.Set keepConstantArguments -> j
     java.util.Set noObfuscation -> c
     java.util.Set alwaysInline -> f
-    java.util.Set neverClassInline -> k
-    java.util.Set neverMerge -> l
-    java.util.Set neverPropagateValue -> m
-    1:1:void <clinit>():1018:1018 -> <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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1018:1018 -> <init>
-    2:22: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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1062:1082 -> <init>
-    1:1:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1086:1086 -> a
+    java.util.Set keepUnusedArguments -> k
+    java.util.Set neverClassInline -> l
+    java.util.Set neverMerge -> m
+    java.util.Set neverPropagateValue -> n
+    1:1:void <clinit>():1030:1030 -> <clinit>
+    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1030:1030 -> <init>
+    2:23:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1076:1097 -> <init>
+    1:1:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1101:1101 -> a
     2:2:java.util.List com.android.tools.r8.shaking.ProguardConfiguration.getRules():607:607 -> a
-    2:2:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1086 -> a
-    3:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1088:1097 -> a
-    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094:1094 -> a
+    2:2:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1101 -> a
+    3:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1103:1112 -> a
+    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109:1109 -> a
     14:16:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094 -> a
-    17:22:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1114:1119 -> a
-    23:24:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1121:1122 -> a
-    25:25:void addDependentItems(java.util.Map):1128:1128 -> a
-    26:27:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1131:1132 -> a
-    28:28:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1136:1136 -> a
-    29:30:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> a
-    29:30:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
+    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109 -> a
+    17:22:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1129:1134 -> a
+    23:24:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1136:1137 -> a
+    25:25:void addDependentItems(java.util.Map):1143:1143 -> a
+    26:27:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1146:1147 -> a
+    28:28:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1151:1151 -> a
+    29:30:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
+    29:30:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
     31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
     31:31:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():604 -> a
-    31:31:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141 -> a
-    31:31:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    32:32:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141:1141 -> a
-    32:32:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    33:33:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> a
-    33:33:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162 -> a
-    34:35:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162:1163 -> a
-    36:37:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> a
-    38:38:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> a
-    39:43:void lambda$forEachDependentNonStaticMember$5(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):1165:1169 -> a
-    44:48:void prune(com.android.tools.r8.graph.DexReference):1193:1197 -> a
-    49:49:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> a
-    50:59:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1228:1237 -> a
-    60:68:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1275:1283 -> a
-    69:102:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1290:1323 -> a
+    31:31:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156 -> a
+    31:31:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    32:32:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156:1156 -> a
+    32:32:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    33:33:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
+    33:33:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177 -> a
+    34:35:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177:1178 -> a
+    36:37:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> a
+    38:38:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> a
+    39:43:void lambda$forEachDependentNonStaticMember$5(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):1180:1184 -> a
+    44:48:void prune(com.android.tools.r8.graph.DexReference):1208:1212 -> a
+    49:49:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    50:59:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1243:1252 -> a
+    60:68:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1290:1298 -> a
+    69:102:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1305:1338 -> a
     103:103:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    103:103:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1327 -> a
-    104:113:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1327:1336 -> a
+    103:103:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1342 -> a
+    104:113:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1342:1351 -> a
     114:114:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    114:114:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1340 -> a
-    115:137:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1340:1362 -> a
-    138:138:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1388:1388 -> a
-    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1122:1122 -> b
-    2:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> b
-    2:3:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
+    114:114:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1355 -> a
+    115:137:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1355:1377 -> a
+    138:138:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1403:1403 -> a
+    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1137:1137 -> b
+    2:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> b
+    2:3:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> b
     4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():604 -> b
-    4:4:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141 -> b
-    4:4:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    5:5:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1141:1141 -> b
-    5:5:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    6:6:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> b
-    6:6:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148 -> b
-    7:8:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148:1149 -> b
-    9:11:void lambda$forEachDependentStaticMember$4(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):1151:1153 -> b
-    12:12:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1206:1206 -> b
-    13:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1214:1216 -> b
-    16:20:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1215:1219 -> b
-    21:26:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1218:1223 -> b
-    27:27:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1222:1222 -> b
-    28:38:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1245:1255 -> b
-    1:1:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1131:1131 -> c
-    2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1264:1268 -> c
-    7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1308:1308 -> c
-    1:21:java.lang.String toString():1370:1390 -> toString
+    4:4:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156 -> b
+    4:4:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    5:5:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1156:1156 -> b
+    5:5:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    6:6:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> b
+    6:6:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163 -> b
+    7:8:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163:1164 -> b
+    9:11:void lambda$forEachDependentStaticMember$4(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):1166:1168 -> b
+    12:12:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1221:1221 -> b
+    13:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1229:1231 -> b
+    16:20:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1230:1234 -> b
+    21:26:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1233:1238 -> b
+    27:27:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1237:1237 -> b
+    28:38:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1260:1270 -> b
+    1:1:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1146:1146 -> c
+    2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
+    7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
+    1:21:java.lang.String toString():1385:1405 -> toString
 com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.x2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
@@ -60498,17 +60821,17 @@
     119:119:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):227 -> a
     120:121:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):232:233 -> a
     122:136:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> a
-    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
     138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
     146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
     153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
-    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> a
+    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> a
     176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> a
     177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
     179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
     191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
@@ -60640,14 +60963,14 @@
     3:5:void initializeMergeCandidates(java.lang.Iterable):269:271 -> a
     6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:341 -> a
     24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:349 -> a
-    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
+    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):349 -> a
     28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):355:361 -> a
     35:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:393 -> a
-    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):781:782 -> a
+    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     59:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):394 -> a
     61:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:400 -> a
-    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):597:597 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):603:603 -> a
     67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
     68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
     69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
@@ -60805,8 +61128,8 @@
     31:32:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1114:1115 -> a
     33:33:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1129:1129 -> a
     34:34:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
-    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
-    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():79 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
+    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
     35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
     36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
     37:40:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1309:1312 -> a
@@ -60862,10 +61185,10 @@
     90:90:boolean merge():955 -> c
     91:94:boolean merge():959:962 -> c
     95:111:boolean merge():961:977 -> c
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
-    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> c
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> c
     112:112:boolean merge():977 -> c
-    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> c
     113:114:boolean merge():977 -> c
     115:115:boolean merge():979:979 -> c
     116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
@@ -60986,11 +61309,11 @@
     1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
 com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Q2:
-    com.android.tools.r8.ir.code.Invoke$Type type -> e
-    boolean isInterface -> f
-    com.android.tools.r8.graph.DexMethod invocationTarget -> d
-    com.android.tools.r8.graph.DexMethod originalMethod -> c
-    com.android.tools.r8.graph.DexMethod method -> b
+    com.android.tools.r8.ir.code.Invoke$Type type -> f
+    com.android.tools.r8.graph.DexMethod invocationTarget -> e
+    boolean isInterface -> g
+    com.android.tools.r8.graph.DexMethod originalMethod -> d
+    com.android.tools.r8.graph.DexMethod method -> c
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1909:1914 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> a
     2:3:void updateMethodSignatures(java.util.function.Function):1929:1930 -> a
@@ -61167,6 +61490,16 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.b3:
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
+    2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
+    java.lang.String typeString() -> u
+    1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.Z2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.a3:
+    1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
+    2:2:void <init>():16:16 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
 com.android.tools.r8.utils.AarArchiveResourceProvider -> com.android.tools.r8.utils.a:
     com.android.tools.r8.origin.Origin origin -> a
     java.nio.file.Path archive -> b
@@ -61225,42 +61558,42 @@
     com.android.tools.r8.utils.AndroidApiLevel K -> m
     com.android.tools.r8.utils.AndroidApiLevel H_MR2 -> s
     com.android.tools.r8.utils.AndroidApiLevel I_MR1 -> q
-    1:30:void <clinit>():12:41 -> <clinit>
-    31:63:void <clinit>():11:43 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):47:48 -> <init>
-    1:1:int getLevel():52:52 -> a
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():60:60 -> b
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):146:146 -> b
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):144:144 -> b
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):142:142 -> b
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):140:140 -> b
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):138:138 -> b
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):136:136 -> b
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):134:134 -> b
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):132:132 -> b
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):130:130 -> b
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):128:128 -> b
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):126:126 -> b
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):124:124 -> b
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):122:122 -> b
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):120:120 -> b
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):118:118 -> b
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):116:116 -> b
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):114:114 -> b
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):112:112 -> b
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):110:110 -> b
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):108:108 -> b
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):106:106 -> b
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):104:104 -> b
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):102:102 -> b
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):100:100 -> b
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):98:98 -> b
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):96:96 -> b
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):94:94 -> b
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):92:92 -> b
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):90:90 -> b
-    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):88:88 -> b
-    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):86:86 -> b
+    1:30:void <clinit>():15:44 -> <clinit>
+    31:63:void <clinit>():14:46 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):50:51 -> <init>
+    1:1:int getLevel():55:55 -> a
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():63:63 -> b
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):155:155 -> b
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):153:153 -> b
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):151:151 -> b
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):149:149 -> b
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):147:147 -> b
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):145:145 -> b
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> b
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> b
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> b
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> b
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> b
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> b
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> b
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> b
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> b
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> b
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> b
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> b
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> b
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> b
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> b
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> b
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> b
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> b
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> b
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> b
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> b
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> b
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> b
+    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
+    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> b
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.h:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.StringResource proguardMapOutputData -> f
@@ -61465,6 +61798,7 @@
 com.android.tools.r8.utils.Box -> com.android.tools.r8.utils.m:
     java.lang.Object value -> a
     1:1:void <init>():11:11 -> <init>
+    2:3:void <init>(java.lang.Object):13:14 -> <init>
     1:1:java.lang.Object get():18:18 -> a
     2:2:void set(java.lang.Object):22:22 -> a
     1:1:boolean isSet():26:26 -> b
@@ -61561,7 +61895,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1205:1205 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -61733,39 +62067,49 @@
 com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.E:
     1:14:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):18:31 -> a
     15:25:void com.android.tools.r8.utils.ThreadUtils.awaitFutures(java.lang.Iterable):24:34 -> a
-    26:26:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):25:25 -> a
-    27:27:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25:25 -> a
-    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25 -> a
-    33:33:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29:29 -> a
-    34:38:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    34:38:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29 -> a
+    26:26:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):27:27 -> a
+    27:27:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String) -> a
+    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    28:32:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27 -> a
+    33:33:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31:31 -> a
+    34:38:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    34:38:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31 -> a
     39:53:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],com.android.tools.r8.BaseCommand$Builder):33:47 -> a
     54:54:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):48:48 -> a
     55:56:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorServiceForProcessors(int):41:42 -> a
     55:56:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):48 -> a
     57:57:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(int):49:49 -> a
-    58:68:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):65:75 -> a
-    69:69:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
-    70:72:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    70:72:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    73:73:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
-    74:76:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    74:76:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
-    77:77:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    78:80:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    78:80:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
-    81:81:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    82:88:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):104:110 -> a
-    82:88:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    89:89:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    90:92:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    90:92:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    93:93:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):77:77 -> a
-    94:103:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):87:96 -> a
-    104:105:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):90:91 -> a
-    106:115:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):114:123 -> a
-    116:117:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):117:118 -> a
+    58:75:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:84 -> a
+    76:78:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):78:80 -> a
+    79:79:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    79:79:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    80:85:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    80:85:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    86:87:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    86:87:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    88:90:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:82 -> a
+    91:91:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75:75 -> a
+    92:94:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    92:94:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75 -> a
+    95:95:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
+    96:98:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    96:98:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    99:99:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
+    100:102:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    100:102:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
+    103:103:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    104:110:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):113:119 -> a
+    104:110:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    111:111:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    112:114:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    112:114:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    115:115:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):86:86 -> a
+    116:125:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):96:105 -> a
+    126:127:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):99:100 -> a
+    128:137:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):123:132 -> a
+    138:139:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):126:127 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> c
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> c
@@ -61923,345 +62267,342 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.O:
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> S0
     boolean passthroughDexCode -> i
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
     boolean quiet -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
+    java.lang.String printCfgFile -> A0
     boolean enableRedundantConstNumberOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> t0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> X0
     boolean enableClassInlining -> y
-    java.util.List mainDexKeepRules -> J0
     boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
+    boolean minimalMainDex -> J0
+    boolean configurationDebugging -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean printCfg -> A0
     boolean enableStringSwitchConversion -> Q
     boolean enableUnusedArgumentRemoval -> r
-    boolean enableMinification -> z0
-    java.util.Map warningInvalidDebugInfo -> P0
-    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean printCfg -> z0
+    boolean lookupLibraryBeforeProgram -> v0
     boolean enableClassStaticizer -> z
-    boolean enableNestBasedAccessDesugaring -> r0
+    boolean enableNestReduction -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
-    boolean enableLambdaMerging -> n0
+    boolean enableDesugaring -> n0
+    boolean intermediate -> j0
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> Z0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> T0
     boolean invalidDebugInfoFatal -> c0
     boolean enableValuePropagation -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> s0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> D0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Y0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
-    java.util.Set nullableReceiverInliningFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean minimalMainDex -> K0
+    boolean enableInheritanceClassInDexDistributor -> K0
     int inliningInstructionLimit -> N
-    boolean configurationDebugging -> F0
+    boolean skipIR -> F0
     boolean enableVerticalClassMerging -> p
+    boolean $assertionsDisabled -> c1
+    boolean ignoreMissingClasses -> B0
     boolean enableUninstantiatedTypeOptimization -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean lookupLibraryBeforeProgram -> w0
-    boolean enableNestReduction -> s0
-    java.util.Map warningInvalidParameterAnnotations -> O0
+    boolean enableMainDexListCheck -> w0
+    java.util.List logArgumentsFilter -> l0
+    java.util.Map warningInvalidDebugInfo -> O0
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableDesugaring -> o0
-    boolean intermediate -> k0
+    boolean enableGeneratedExtensionRegistryShrinking -> o0
+    java.util.List methodsFilter -> h0
+    boolean readCompileTimeAnnotations -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
     boolean ignoreMainDexMissingClasses -> d0
     int inliningInstructionAllowance -> O
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> Q0
+    com.android.tools.r8.StringConsumer configurationConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> H0
     java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
-    boolean enableInheritanceClassInDexDistributor -> L0
-    boolean debug -> H0
+    boolean skipReadingDexCode -> P0
     boolean enableDeterminismAnalysis -> C
     int inliningControlFlowResolutionBlocksThreshold -> P
-    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
-    boolean skipIR -> G0
-    boolean $assertionsDisabled -> d1
-    boolean ignoreMissingClasses -> C0
+    boolean debug -> G0
+    boolean forceProguardCompatibility -> C0
     boolean enableRedundantFieldLoadElimination -> U
     boolean enableInlining -> v
-    int minApiLevel -> j0
-    boolean enableMainDexListCheck -> x0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
-    boolean enableGeneratedExtensionRegistryShrinking -> p0
-    java.util.List logArgumentsFilter -> m0
-    java.util.Map missingEnclosingMembers -> N0
+    boolean enableTreeShaking -> x0
+    boolean enableGeneratedMessageLiteShrinking -> p0
+    java.util.Map warningInvalidParameterAnnotations -> N0
     int numberOfThreads -> Y
-    boolean readCompileTimeAnnotations -> l0
-    java.util.Set reportedMissingForDesugaring -> c1
-    java.util.List methodsFilter -> i0
     boolean enableServiceLoaderRewriting -> D
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> R0
     boolean hasMarker -> e0
     boolean verbose -> a0
-    com.android.tools.r8.StringConsumer configurationConsumer -> V0
-    java.lang.String printCfgFile -> B0
     boolean enableEnumValueOptimization -> R
     boolean enableUnusedInterfaceRemoval -> s
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
     boolean useSmaliSyntax -> Z
     java.util.Set extensiveLoggingFilter -> f0
-    boolean skipReadingDexCode -> Q0
+    java.util.List mainDexKeepRules -> I0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
-    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    java.util.function.Consumer syntheticProguardRulesConsumer -> a1
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    boolean enableTreeShaking -> y0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
+    int minApiLevel -> i0
+    boolean enableMinification -> y0
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> V0
     boolean enableDevirtualization -> t
-    boolean enableGeneratedMessageLiteShrinking -> q0
+    boolean processCovariantReturnTypeAnnotations -> u0
+    boolean enableNestBasedAccessDesugaring -> q0
+    java.util.Map missingEnclosingMembers -> M0
+    boolean enableLambdaMerging -> m0
     boolean enableSideEffectAnalysis -> B
-    1:22:void <clinit>():65:86 -> <clinit>
-    23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():64:64 -> <clinit>
-    23:23:void <clinit>():87 -> <clinit>
-    24:24:void <clinit>():87:87 -> <clinit>
-    25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():64:64 -> <clinit>
-    25:25:void <clinit>():87 -> <clinit>
-    1:1:void <init>():111:111 -> <init>
-    2:522:void <init>():105:625 -> <init>
-    523:527:void <init>():112:116 -> <init>
-    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:120 -> <init>
-    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:128 -> <init>
-    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:132 -> <init>
-    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:144 -> <init>
-    1:1:boolean isDesugaredLibraryCompilation():308:308 -> A
-    1:1:boolean isGeneratingClassFiles():329:329 -> B
-    1:1:boolean isGeneratingDexIndexed():321:321 -> C
-    1:1:boolean isGeneratingDex():317 -> C
-    2:2:boolean isGeneratingDexFilePerClassFile():325:325 -> C
-    2:2:boolean isGeneratingDex():317 -> C
-    1:1:boolean hasConsumer():292:292 -> D
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> L0
+    java.util.Set reportedMissingForDesugaring -> b1
+    1:22:void <clinit>():66:87 -> <clinit>
+    23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
+    23:23:void <clinit>():88 -> <clinit>
+    24:24:void <clinit>():88:88 -> <clinit>
+    25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
+    25:25:void <clinit>():88 -> <clinit>
+    1:1:void <init>():112:112 -> <init>
+    2:520:void <init>():106:624 -> <init>
+    521:525:void <init>():113:117 -> <init>
+    526:526:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    527:1045:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1046:1053:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1054:1054:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1055:1573:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1574:1585:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():309:309 -> A
+    1:1:boolean isGeneratingClassFiles():330:330 -> B
+    1:1:boolean isGeneratingDexIndexed():322:322 -> C
+    1:1:boolean isGeneratingDex():318 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():326:326 -> C
+    2:2:boolean isGeneratingDex():318 -> C
+    1:1:boolean hasConsumer():293:293 -> D
     1:1:boolean isInterfaceMethodDesugaringEnabled():1065 -> D
     2:4:boolean isInterfaceMethodDesugaringEnabled():1068:1070 -> D
-    1:1:boolean isMinifying():426:426 -> E
+    1:1:boolean isMinifying():425:425 -> E
     1:1:boolean isProtoShrinkingEnabled():1078:1078 -> F
-    1:1:boolean isShrinking():422:422 -> G
+    1:1:boolean isShrinking():421:421 -> G
     1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> H
-    1:32:boolean printWarnings():800:831 -> I
-    33:72:boolean printWarnings():827:866 -> I
-    1:4:boolean shouldDesugarNests():364:367 -> J
-    5:5:boolean isGeneratingClassFiles():329:329 -> J
+    1:32:boolean printWarnings():799:830 -> I
+    33:72:boolean printWarnings():826:865 -> I
+    1:4:boolean shouldDesugarNests():365:368 -> J
+    5:5:boolean isGeneratingClassFiles():330:330 -> J
     5:5:boolean canUseNestBasedAccess():1048 -> J
-    5:5:boolean shouldDesugarNests():367 -> J
-    1:1:boolean isDesugaredLibraryCompilation():308:308 -> K
-    1:1:boolean shouldKeepStackMapTable():312 -> K
-    2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():98:98 -> K
-    2:2:boolean shouldKeepStackMapTable():313 -> K
-    3:3:boolean shouldKeepStackMapTable():313:313 -> K
-    1:13:void signalFinishedToConsumers():345:357 -> L
-    1:1:boolean assertionsEnabled():620:620 -> M
-    1:9:java.util.Set getExtensiveFieldMinifierLoggingFilter():474:482 -> N
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():487:495 -> O
-    1:9:java.util.Set getExtensiveLoggingFilter():461:469 -> P
-    1:31:java.util.Set getNullableReceiverInliningFilter():499:529 -> Q
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():457:457 -> R
+    5:5:boolean shouldDesugarNests():368 -> J
+    1:1:boolean isDesugaredLibraryCompilation():309:309 -> K
+    1:1:boolean shouldKeepStackMapTable():313 -> K
+    2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
+    2:2:boolean shouldKeepStackMapTable():314 -> K
+    3:3:boolean shouldKeepStackMapTable():314:314 -> K
+    1:13:void signalFinishedToConsumers():346:358 -> L
+    1:1:boolean assertionsEnabled():619:619 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():486:494 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():460:468 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():456:456 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):267:267 -> a
-    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):275:281 -> a
-    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    9:9:boolean isGeneratingClassFiles():329:329 -> a
-    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):282 -> a
-    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283:286 -> a
-    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> a
-    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> a
-    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:745 -> a
-    18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749 -> a
-    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749:749 -> a
-    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750 -> a
-    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750:750 -> a
-    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:745 -> a
-    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:758 -> a
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):268:268 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):276:282 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    9:9:boolean isGeneratingClassFiles():330:330 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):284:287 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> a
+    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):743:744 -> a
+    18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):748 -> a
+    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):748:748 -> a
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749 -> a
+    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749:749 -> a
+    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:744 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):756:757 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760 -> a
-    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760:760 -> a
-    27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
-    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
-    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
-    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766:766 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:758 -> a
-    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):771:774 -> a
-    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):779:783 -> a
-    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:794 -> a
-    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:789 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765:765 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:757 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):770:773 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):778:782 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):787:793 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:788 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:789 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):793:793 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):880:885 -> a
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:788 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):792:792 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):879:884 -> a
     63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1019:1020 -> a
     65:66:boolean canHaveArtInstanceOfVerifierBug():1354:1355 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639:642 -> b
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):638:641 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644:646 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):642:642 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640 -> b
-    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):666:670 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:676 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:645 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641:641 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:669 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):674:675 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678:678 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):782:782 -> b
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:675 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):781:781 -> b
     25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1431:1431 -> b
-    1:1:boolean isGeneratingClassFiles():329:329 -> c
+    1:1:boolean isGeneratingClassFiles():330:330 -> c
     1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445 -> c
     2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445:1445 -> c
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:635 -> c
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> c
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633 -> c
-    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:656 -> c
-    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):657 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> c
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):773:773 -> c
-    1:1:boolean isGeneratingClassFiles():329:329 -> d
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):631:634 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):653:655 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):772:772 -> c
+    1:1:boolean isGeneratingClassFiles():330:330 -> d
     1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101 -> d
     2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101:1101 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):684:686 -> d
-    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):700:734 -> d
-    1:1:boolean isGeneratingClassFiles():329:329 -> e
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):683:685 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):699:733 -> d
+    1:1:boolean isGeneratingClassFiles():330:330 -> e
     1:1:boolean canLeaveStaticInterfaceMethodInvokes():1052 -> e
     2:2:boolean canLeaveStaticInterfaceMethodInvokes():1052:1052 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):693:695 -> e
-    1:1:boolean isGeneratingClassFiles():329:329 -> f
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):692:694 -> e
+    1:1:boolean isGeneratingClassFiles():330:330 -> f
     1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1091 -> f
     2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1091:1091 -> f
-    1:1:boolean isGeneratingClassFiles():329:329 -> g
+    1:1:boolean isGeneratingClassFiles():330:330 -> g
     1:1:boolean canUseConstantMethodHandle():1032 -> g
     2:2:boolean canUseConstantMethodHandle():1032:1032 -> g
-    1:1:boolean isGeneratingClassFiles():329:329 -> h
+    1:1:boolean isGeneratingClassFiles():330:330 -> h
     1:1:boolean canUseConstantMethodType():1036 -> h
     2:2:boolean canUseConstantMethodType():1036:1036 -> h
-    1:1:boolean isGeneratingClassFiles():329:329 -> i
+    1:1:boolean isGeneratingClassFiles():330:330 -> i
     1:1:boolean canUseDefaultAndStaticInterfaceMethods():1044 -> i
     2:2:boolean canUseDefaultAndStaticInterfaceMethods():1044:1044 -> i
     1:2:boolean canUseFilledNewArrayOfObjects():1113:1114 -> j
-    1:1:boolean isGeneratingClassFiles():329:329 -> k
+    1:1:boolean isGeneratingClassFiles():330:330 -> k
     1:1:boolean canUseInvokeCustom():1040 -> k
     2:2:boolean canUseInvokeCustom():1040:1040 -> k
-    1:1:boolean isGeneratingClassFiles():329:329 -> l
+    1:1:boolean isGeneratingClassFiles():330:330 -> l
     1:1:boolean canUseInvokePolymorphic():1028 -> l
     2:2:boolean canUseInvokePolymorphic():1028:1028 -> l
-    1:1:boolean isGeneratingClassFiles():329:329 -> m
+    1:1:boolean isGeneratingClassFiles():330:330 -> m
     1:1:boolean canUseInvokePolymorphicOnVarHandle():1024 -> m
     2:2:boolean canUseInvokePolymorphicOnVarHandle():1024:1024 -> m
     1:2:boolean canUseMultidex():1082:1083 -> n
-    1:1:boolean isGeneratingClassFiles():329:329 -> o
+    1:1:boolean isGeneratingClassFiles():330:330 -> o
     1:1:boolean canUseNotInstruction():1149 -> o
     2:2:boolean canUseNotInstruction():1149:1149 -> o
-    1:1:boolean isGeneratingClassFiles():329:329 -> p
+    1:1:boolean isGeneratingClassFiles():330:330 -> p
     1:1:boolean canUsePrivateInterfaceMethods():1060 -> p
     2:2:boolean canUsePrivateInterfaceMethods():1060:1060 -> p
     1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1122:1123 -> q
-    1:1:boolean isGeneratingClassFiles():329:329 -> r
+    1:1:boolean isGeneratingClassFiles():330:330 -> r
     1:1:boolean canUseSuppressedExceptions():1087 -> r
     2:2:boolean canUseSuppressedExceptions():1087:1087 -> r
-    1:1:boolean isGeneratingClassFiles():329:329 -> s
+    1:1:boolean isGeneratingClassFiles():330:330 -> s
     1:1:boolean canUseTwrCloseResourceMethod():1056 -> s
     2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> s
-    1:4:void disableAllOptimizations():148:151 -> t
-    1:17:void disableGlobalOptimizations():155:171 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> v
-    2:2:boolean hasConsumer():292:292 -> v
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296 -> v
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> v
-    4:4:boolean isGeneratingDexIndexed():321:321 -> v
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> v
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298:298 -> v
-    6:6:boolean isGeneratingDexFilePerClassFile():325:325 -> v
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300:300 -> v
-    8:8:boolean isGeneratingClassFiles():329:329 -> v
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301 -> v
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:304 -> v
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():98:98 -> w
-    1:1:boolean hasMethodsFilter():875:875 -> x
-    1:1:boolean hasProguardConfiguration():94:94 -> y
-    1:1:boolean hasUsageInformationConsumer():582:582 -> z
+    1:4:void disableAllOptimizations():149:152 -> t
+    1:17:void disableGlobalOptimizations():156:172 -> u
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> v
+    2:2:boolean hasConsumer():293:293 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> v
+    4:4:boolean isGeneratingDexIndexed():322:322 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():326:326 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    8:8:boolean isGeneratingClassFiles():330:330 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:305 -> v
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
+    1:1:boolean hasMethodsFilter():874:874 -> x
+    1:1:boolean hasProguardConfiguration():95:95 -> y
+    1:1:boolean hasUsageInformationConsumer():581:581 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing ENABLE -> c
-    1:5:void <clinit>():78:82 -> <clinit>
-    1:1:void <init>(java.lang.String,int):76:76 -> <init>
+    1:5:void <clinit>():79:83 -> <clinit>
+    1:1:void <init>(java.lang.String,int):77:77 -> <init>
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.P:
     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):539:542 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():72:73 -> <clinit>
-    1:1:void <init>(java.lang.String,int):71:71 -> <init>
+    1:2:void <clinit>():73:74 -> <clinit>
+    1:1:void <init>(java.lang.String,int):72:72 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.O$c:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():907:915 -> <init>
+    1:9:void <init>():906:914 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():900:904 -> <clinit>
-    6:6:void <clinit>():898:898 -> <clinit>
-    1:1:void <init>(java.lang.String,int):898:898 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():898:898 -> a
+    1:5:void <clinit>():899:903 -> <clinit>
+    6:6:void <clinit>():897:897 -> <clinit>
+    1:1:void <init>(java.lang.String,int):897:897 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():897:897 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> H
     boolean enableDeadSwitchCaseElimination -> i
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -62269,17 +62610,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean allowOutlinerInterfaceArrayArguments -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean measureProguardIfRuleEvaluations -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean verifyKeptGraphInfo -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> F
     boolean forceJumboStringProcessing -> p
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -62287,12 +62627,14 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
-    boolean enableForceNestBasedAccessDesugaringForTest -> B
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
-    boolean readInputStackMaps -> D
-    1:84:void <init>():918:1001 -> <init>
+    java.io.PrintStream whyAreYouNotInliningConsumer -> B
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():917:1001 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
     1:3:void <init>():987:989 -> <init>
@@ -62305,7 +62647,7 @@
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):551:553 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -62400,7 +62742,7 @@
     290:294:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):314:318 -> a
     295:295:void sortMethods(java.util.List):327:327 -> a
     296:297:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1075 -> a
+    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1097:1097 -> a
     298:298:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
     299:299:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
     300:304:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:360 -> a
@@ -62636,7 +62978,7 @@
     18:22:boolean assumeClassesAreEqual(com.android.tools.r8.graph.DexProgramClass):84:88 -> a
     18:22:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):73 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):76:76 -> a
-    24:24:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():86:86 -> a
+    24:24:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     24:24:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):78 -> a
     25:25:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):78:78 -> a
     26:26:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a

r8-master.jar

diff --git a/r8-master.jar b/r8-master.jar
index 5aae3db..0e8f35b 100644
--- a/r8-master.jar
+++ b/r8-master.jar
Binary files differ

r8-master.jar.map

diff --git a/r8-master.jar.map b/r8-master.jar.map
index da00c01..5656edd 100644
--- a/r8-master.jar.map
+++ b/r8-master.jar.map
@@ -1,17 +1,17 @@
 # compiler: R8
-# compiler_version: 1.7.6-dev
+# compiler_version: 1.7.7-dev
 # compiler_hash: engineering
-# pg_map_id: e6a1165
+# pg_map_id: 41bac76
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:15 -> <init>
     1:1:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:21 -> a
-    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    2:2:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     2:2:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
     3:7:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24:28 -> a
-    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():56:56 -> a
+    8:8:java.lang.String com.android.tools.r8.utils.AndroidApiLevel.getName():59:59 -> a
     8:8:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
 com.android.tools.r8.ArchiveClassFileProvider -> com.android.tools.r8.ArchiveClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
@@ -217,19 +217,17 @@
     1:32:void validate():482:513 -> d
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> e
     1:1:boolean hasDesugaredLibraryConfiguration():466:466 -> f
-    1:1:boolean isMinApiLevelSet():390:390 -> g
+    1:1:boolean isOptimizeMultidexForLinearAlloc():262:262 -> g
     1:1:java.util.function.BiPredicate getDexClassChecksumFilter():244:244 -> getDexClassChecksumFilter
     1:1:boolean getDisableDesugaring():427:427 -> getDisableDesugaring
     1:1:boolean getIncludeClassesChecksum():477:477 -> getIncludeClassesChecksum
     1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():237:237 -> getMainDexListConsumer
-    1:1:boolean isMinApiLevelSet():390:390 -> getMinApiLevel
-    1:1:int getMinApiLevel():386 -> getMinApiLevel
-    2:2:int getMinApiLevel():386:386 -> getMinApiLevel
+    1:1:int getMinApiLevel():386:386 -> getMinApiLevel
     1:1:com.android.tools.r8.CompilationMode getMode():190:190 -> getMode
     1:1:com.android.tools.r8.OutputMode getOutputMode():219:219 -> getOutputMode
     1:1:java.nio.file.Path getOutputPath():209:209 -> getOutputPath
     1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():230:230 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():262:262 -> h
+    1:1:boolean isMinApiLevelSet():390:390 -> isMinApiLevelSet
     1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):340:342 -> setDexClassChecksumFilter
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):421:422 -> setDisableDesugaring
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):405:406 -> setEnableDesugaring
@@ -336,13 +334,13 @@
     16:16:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     17:17:void lambda$run$4(java.lang.String):197:197 -> a
     18:20:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    21:21:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):356:356 -> 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):363:363 -> a
     21:21:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     22:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:143 -> c
     1:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:176 -> d
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):352:352 -> d
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
     28:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     29:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     40:44:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -353,13 +351,13 @@
     97:102:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):227:232 -> d
     1:5:void main(java.lang.String[]):127:131 -> main
     1:5:void run(com.android.tools.r8.D8Command):75:79 -> run
-    6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> 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
     6:6:void run(com.android.tools.r8.D8Command):78 -> run
     7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):97:100 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):99 -> run
     1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):136:137 -> runForTesting
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> runForTesting
+    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 -> runForTesting
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):137 -> runForTesting
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> s
@@ -532,7 +530,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(java.util.Map):32:33 -> <init>
     1:2:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):62:63 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    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):63 -> a
     4:4:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):65:65 -> a
     5:46:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):74:115 -> a
@@ -903,7 +901,7 @@
     1:13:void main(java.lang.String[]):163:175 -> main
     1:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):124:128 -> run
     6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):147:151 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):58:58 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> run
     11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):150 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):159:159 -> run
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
@@ -956,26 +954,27 @@
 com.android.tools.r8.GeneratedOutlineSupport -> com.android.tools.r8.i:
     long outline0(long,long,long) -> a
     com.android.tools.r8.ir.code.BasicBlock outline1(com.android.tools.r8.ir.code.BasicBlock) -> a
-    java.lang.StringBuilder outline10(java.lang.String,int,java.lang.String) -> a
-    java.lang.String outline2(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
-    java.lang.String outline3(java.lang.String,int) -> a
-    java.lang.String outline4(java.lang.String,int,int) -> a
-    java.lang.String outline6(java.lang.String,java.lang.String) -> a
-    java.lang.String outline7(java.lang.StringBuilder,int,java.lang.String) -> a
-    java.lang.String outline8(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
-    java.lang.StringBuilder outline9(java.lang.String) -> a
-    java.lang.String outline5(java.lang.String,int,java.lang.String) -> b
+    java.lang.StringBuilder outline10(java.lang.String) -> a
+    java.lang.StringBuilder outline11(java.lang.String,int,java.lang.String) -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline2(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
+    java.lang.String outline3(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.String outline4(java.lang.String,int) -> a
+    java.lang.String outline5(java.lang.String,int,int) -> a
+    java.lang.String outline7(java.lang.String,java.lang.String) -> a
+    java.lang.String outline8(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.String outline6(java.lang.String,int,java.lang.String) -> b
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87:87 -> a
-    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):48:48 -> a
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):87 -> a
     3:10:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:100 -> a
     11:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:137 -> a
     11:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    43:43:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> a
+    43:43:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
     43:43:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     43:43:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     44:52:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -1014,33 +1013,33 @@
     3:3:void <init>():158:158 -> <init>
     4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):162:162 -> <init>
     5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):154:155 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):189:189 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):195:195 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():227:231 -> b
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):194:194 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):182:182 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):188:188 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():220:224 -> b
     1:5:com.android.tools.r8.BaseCommand makeCommand():151 -> b
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> b
-    6:6:com.android.tools.r8.L8Command makeCommand():232 -> b
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> b
+    6:6:com.android.tools.r8.L8Command makeCommand():225 -> b
     6:6:com.android.tools.r8.BaseCommand makeCommand():151 -> b
-    7:63:com.android.tools.r8.L8Command makeCommand():232:288 -> b
+    7:63:com.android.tools.r8.L8Command makeCommand():225:281 -> b
     7:63:com.android.tools.r8.BaseCommand makeCommand():151 -> b
-    64:64:com.android.tools.r8.L8Command makeCommand():228:228 -> b
+    64:64:com.android.tools.r8.L8Command makeCommand():221:221 -> b
     64:64:com.android.tools.r8.BaseCommand makeCommand():151 -> b
     com.android.tools.r8.BaseCommand$Builder self() -> c
-    1:16:void validate():207:222 -> d
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> e
-    1:2:boolean isShrinking():167:168 -> isShrinking
+    1:16:void validate():200:215 -> d
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> e
+    1:1:boolean isShrinking():167:167 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
     1:1:void <init>():79:79 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):83:87 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):85:91 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():294:296 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:304 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):303:303 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):302:302 -> accept
-    1:1:java.util.Collection getProgramResources():309:309 -> getProgramResources
+    1:3:void <init>():287:289 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:297 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):296:296 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):295:295 -> accept
+    1:1:java.util.Collection getProgramResources():302:302 -> getProgramResources
 com.android.tools.r8.OptionalBool -> com.android.tools.r8.m:
     com.android.tools.r8.OptionalBool TRUE -> a
     com.android.tools.r8.OptionalBool FALSE -> b
@@ -1145,66 +1144,66 @@
     496:509:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):642:655 -> a
     510:514:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):654:658 -> a
     515:570:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):657:712 -> a
-    571:661:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:801 -> a
-    662:687:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:775 -> a
-    688:688:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):771:771 -> a
-    689:709:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):769:789 -> a
-    710:727:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):784:801 -> a
-    728:728:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
-    729:729:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
-    730:1156:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:801 -> a
-    1157:1158:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
-    1159:1159:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
-    1160:1164:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
-    1165:1165:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
-    1166:1166:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
-    1167:1167:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
-    1168:1168:void lambda$run$9(java.lang.String):744:744 -> a
-    1169:1169:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
-    1170:1170:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
-    1171:1173: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):818:820 -> a
-    1174:1196: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):819:841 -> a
-    1197:1208: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):839:850 -> a
-    1209: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):849:853 -> a
-    1214:1219: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:856 -> a
-    1220:1220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1220:1220:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):856 -> a
-    1221:1221:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1221:1221:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1221:1221: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):856 -> a
-    1222:1222: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):856:856 -> a
-    1223:1226:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):860:863 -> a
-    1227:1227:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):882:882 -> a
-    1228:1228:void lambda$main$13(java.lang.String[]):898:898 -> a
+    571:665:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:805 -> a
+    666:695:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):750:779 -> a
+    696:696:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):775:775 -> a
+    697:717:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):773:793 -> a
+    718:735:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):788:805 -> a
+    736:736:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):678:678 -> a
+    737:737:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):523:523 -> a
+    738:1168:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):375:805 -> a
+    1169:1170:void lambda$run$2(com.android.tools.r8.graph.DexType):273:274 -> a
+    1171:1171:void lambda$run$2(com.android.tools.r8.graph.DexType):273:273 -> a
+    1172:1176:java.lang.Iterable lambda$run$5(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):580:584 -> a
+    1177:1177:java.lang.Iterable lambda$run$6(com.android.tools.r8.graph.AppView):659:659 -> a
+    1178:1178:void lambda$run$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):690:690 -> a
+    1179:1179:void lambda$run$8(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):698:698 -> a
+    1180:1180:void lambda$run$9(java.lang.String):744:744 -> a
+    1181:1181:void lambda$run$10(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> a
+    1182:1182:boolean lambda$run$11(com.android.tools.r8.graph.DexProgramClass):767:767 -> a
+    1183:1185: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):822:824 -> a
+    1186:1208: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):823:845 -> a
+    1209:1220:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):843:854 -> a
+    1221:1225: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):853:857 -> a
+    1226:1231: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):855:860 -> a
+    1232:1232:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1232:1232: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):860 -> a
+    1233:1233:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1233:1233:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1233: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):860 -> a
+    1234:1234: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):860:860 -> a
+    1235:1238:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):864:867 -> a
+    1239:1239:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):886:886 -> a
+    1240:1240:void lambda$main$13(java.lang.String[]):902:902 -> 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):230:232 -> b
-    4:5:void run(java.lang.String[]):868:869 -> b
+    4:5:void run(java.lang.String[]):872:873 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):870 -> b
-    7:7:void run(java.lang.String[]):871:871 -> b
+    6:6:void run(java.lang.String[]):874 -> b
+    7:7:void run(java.lang.String[]):875:875 -> 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[]):870 -> b
-    9:16:void run(java.lang.String[]):874:881 -> b
-    17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> b
-    17:17:void run(java.lang.String[]):881 -> b
-    18:18:void run(java.lang.String[]):884:884 -> b
+    8:8:void run(java.lang.String[]):874 -> b
+    9:16:void run(java.lang.String[]):878:885 -> 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[]):885 -> b
+    18:18:void run(java.lang.String[]):888:888 -> b
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):239:239 -> c
-    1:5:void main(java.lang.String[]):894:898 -> main
+    1:5:void main(java.lang.String[]):898:902 -> main
     1:3:void run(com.android.tools.r8.R8Command):158:160 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):174:177 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> 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):176 -> run
     1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):225:226 -> runForTesting
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):53:53 -> runForTesting
+    3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> runForTesting
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> runForTesting
     1:2:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> writeApplication
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> writeApplication
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> writeApplication
     3:3:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> writeApplication
     4:4:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> writeApplication
-    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():341:341 -> writeApplication
+    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> writeApplication
     5:5:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> writeApplication
     6:20:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:212 -> writeApplication
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
@@ -1245,7 +1244,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():825:835 -> getInternalOptions
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():832:842 -> getInternalOptions
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():839:856 -> getInternalOptions
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> getInternalOptions
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> getInternalOptions
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():857 -> getInternalOptions
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():858:872 -> getInternalOptions
     1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):662:662 -> parse
@@ -1315,8 +1314,8 @@
     1:18:void validate():381:398 -> d
     19:44:void validate():396:421 -> d
     1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():140:140 -> e
-    1:1:void internalForceProguardCompatibility():126:126 -> i
-    1:113:com.android.tools.r8.R8Command makeR8Command():434:546 -> j
+    1:1:void internalForceProguardCompatibility():126:126 -> h
+    1:113:com.android.tools.r8.R8Command makeR8Command():434:546 -> i
     1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):254:254 -> setDesugaredLibraryKeepRuleConsumer
     1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):161:161 -> setDisableMinification
     1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):150:150 -> setDisableTreeShaking
@@ -2163,14 +2162,14 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):115:115 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:123 -> <init>
     1:8:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:134 -> a
-    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> a
     9:9:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):136 -> a
     10:12:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):137:139 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():197:197 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():200:200 -> a
     13:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():201:201 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():204:204 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():205:205 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():208:208 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143:143 -> a
     17:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
@@ -8294,7 +8293,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.t.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -12744,19 +12744,19 @@
     69:73:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):139:143 -> a
     74:75:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):164:165 -> a
     74:75:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    76:86:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):68:78 -> a
+    76:86:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):77:87 -> a
     76:86:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     76:86:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    87:87:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):76:76 -> a
+    87:87:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
     87:87:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     87:87:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    88:88:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):74:74 -> a
+    88:88:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
     88:88:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     88:88:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    89:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):72:72 -> a
+    89:89:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
     89:89:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     89:89:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
-    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):70:70 -> a
+    90:90:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:79 -> a
     90:90:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167 -> a
     90:90:int access$200(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):56 -> a
     91:94:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):167:170 -> a
@@ -12850,10 +12850,10 @@
     160:168:void write(java.util.concurrent.ExecutorService):358:366 -> a
     169:169:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):294:294 -> a
     170:174:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):305:309 -> a
-    175:175:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> a
+    175:175:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> a
     175:175:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):309 -> a
     176:183:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):312:319 -> a
-    184:184:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():333:333 -> a
+    184:184:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():334:334 -> a
     184:184:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):319 -> a
     185:188:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:326 -> a
     189:189:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):325:325 -> a
@@ -12910,10 +12910,10 @@
     484:484:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638:638 -> a
     485:490:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):634:639 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189:189 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():325:325 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():326:326 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):189 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():337:337 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():338:338 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:201 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -12986,7 +12986,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.dex.d:
@@ -13305,7 +13305,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13963,7 +13963,7 @@
     245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     249:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
+    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
     251:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     252:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     258:258:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -15338,7 +15338,7 @@
     28:36:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380:388 -> a
     37:60:com.android.tools.r8.graph.DexEncodedMethod resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MultiResultBuilder):425:448 -> a
     61:65:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608:612 -> a
-    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> a
+    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
     66:66:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96 -> a
     67:67:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
     1:4:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):81:84 -> addSynthesizedClass
@@ -15396,88 +15396,90 @@
     9:12:com.android.tools.r8.graph.ResolutionResult build():666:669 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.c:
     1:8:void <clinit>():27:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):127:127 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexApplication):114:130 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):134:134 -> <init>
-    20:44:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):114:138 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
     1:1:java.util.Set access$000():27:27 -> a
-    2:2:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):208:208 -> a
-    3:26:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):213:236 -> a
-    27:35:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):242:250 -> a
-    36:70:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):255:289 -> a
-    36:70:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250 -> a
-    71:80:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:524 -> a
-    81:90:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):532:541 -> a
-    91:103:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):617:629 -> a
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):143:164 -> addSynthesizedClass
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):556:564 -> allImmediateExtendsSubtypes
-    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):580:584 -> allImmediateImplementsSubtypes
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):450:450 -> allImmediateSubtypes
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):199:202 -> b
-    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):509:509 -> b
-    6:6:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):559:559 -> b
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):562:562 -> c
-    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):655:703 -> computeLeastUpperBoundOfClasses
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):582:582 -> d
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):199:199 -> e
-    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):552:552 -> forAllImmediateExtendsSubtypes
-    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):576:576 -> forAllImmediateImplementsSubtypes
-    1:2:java.util.Set getMissingClasses():185:186 -> getMissingClasses
-    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):634:637 -> getSingleSubtype
+    2:2:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> a
+    3:26:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    27:35:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    36:70:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    36:70:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    71:80:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):521:530 -> a
+    81:90:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):538:547 -> a
+    91:103:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):623:635 -> a
+    104:135:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):724:755 -> a
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> addSynthesizedClass
+    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):562:570 -> allImmediateExtendsSubtypes
+    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):586:590 -> allImmediateImplementsSubtypes
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):456:456 -> allImmediateSubtypes
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):515:515 -> b
+    6:6:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):565:565 -> b
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):568:568 -> c
+    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):661:709 -> computeLeastUpperBoundOfClasses
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):588:588 -> d
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> e
+    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> forAllImmediateExtendsSubtypes
+    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> forAllImmediateImplementsSubtypes
+    1:2:java.util.Set getMissingClasses():191:192 -> getMissingClasses
+    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):640:643 -> 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):637 -> getSingleSubtype
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> 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):637 -> getSingleSubtype
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):637:637 -> getSingleSubtype
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):331:331 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):463:463 -> hasSubtypes
-    1:1:boolean hasSubtyping():439:439 -> hasSubtyping
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):602:613 -> implementedInterfaces
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):612:612 -> implementedInterfaces
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):709:709 -> inDifferentHierarchy
-    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:647 -> isDirectSubtype
-    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):593:593 -> isExternalizable
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):458:458 -> isMarkedAsInterface
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):588:588 -> isMissingOrHasMissingSuperType
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> getSingleSubtype
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643:643 -> getSingleSubtype
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):337:337 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):469:469 -> hasSubtypes
+    1:1:boolean hasSubtyping():445:445 -> hasSubtyping
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):608:619 -> implementedInterfaces
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):618:618 -> implementedInterfaces
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):715:715 -> inDifferentHierarchy
+    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):651:653 -> isDirectSubtype
+    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):599:599 -> isExternalizable
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):464:464 -> isMarkedAsInterface
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594:594 -> isMissingOrHasMissingSuperType
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> isMissingOrHasMissingSuperType
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):589 -> isMissingOrHasMissingSuperType
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):597:597 -> isSerializable
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479:482 -> isStrictSubtypeOf
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> isStrictSubtypeOf
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):483 -> isStrictSubtypeOf
-    8:23:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):496:511 -> isStrictSubtypeOf
-    1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):424:427 -> isStringConcat
-    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):468:471 -> isSubtype
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:171 -> isSubtype
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):472 -> isSubtype
-    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):454:454 -> isUnknown
-    2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> isUnknown
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):454 -> isUnknown
-    1:1:java.lang.Iterable libraryClasses():180:180 -> libraryClasses
-    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():176:176 -> libraryClasses
-    2:2:java.lang.Iterable libraryClasses():181 -> libraryClasses
-    3:3:java.lang.Iterable libraryClasses():181:181 -> libraryClasses
-    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):383:393 -> lookupLambdaImplementedMethods
-    12:12:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():101:101 -> lookupLambdaImplementedMethods
-    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393 -> lookupLambdaImplementedMethods
-    13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):404:417 -> lookupLambdaImplementedMethods
-    27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):386:386 -> lookupLambdaImplementedMethods
-    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):319:324 -> lookupSuperTarget
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595 -> isMissingOrHasMissingSuperType
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):603:603 -> isSerializable
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):485:488 -> isStrictSubtypeOf
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isStrictSubtypeOf
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):489 -> isStrictSubtypeOf
+    8:23:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):502:517 -> isStrictSubtypeOf
+    1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):430:433 -> isStringConcat
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):474:477 -> isSubtype
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isSubtype
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):478 -> isSubtype
+    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):460:460 -> isUnknown
+    2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> isUnknown
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):460 -> isUnknown
+    1:1:java.lang.Iterable libraryClasses():186:186 -> libraryClasses
+    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():182:182 -> libraryClasses
+    2:2:java.lang.Iterable libraryClasses():187 -> libraryClasses
+    3:3:java.lang.Iterable libraryClasses():187:187 -> libraryClasses
+    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):389:399 -> lookupLambdaImplementedMethods
+    12:12:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> lookupLambdaImplementedMethods
+    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):399 -> lookupLambdaImplementedMethods
+    13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):410:423 -> lookupLambdaImplementedMethods
+    27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):392:392 -> lookupLambdaImplementedMethods
+    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:330 -> lookupSuperTarget
     7:7:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> lookupSuperTarget
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> lookupSuperTarget
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> lookupSuperTarget
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> lookupSuperTarget
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:331 -> lookupSuperTarget
     9:9:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> lookupSuperTarget
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325 -> lookupSuperTarget
-    10:12:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:327 -> lookupSuperTarget
-    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):349:355 -> methodDefinedInInterface
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331 -> lookupSuperTarget
+    10:12:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):331:333 -> lookupSuperTarget
+    1:1:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):719:719 -> mayHaveFinalizeMethodDirectlyOrIndirectly
+    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> 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):355 -> methodDefinedInInterface
-    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):355:361 -> methodDefinedInInterface
-    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):336:341 -> methodDefinedInInterfaces
-    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):432:434 -> registerNewType
-    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):190:193 -> subtypes
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():445:445 -> withSubtyping
+    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361 -> methodDefinedInInterface
+    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):361:367 -> methodDefinedInInterface
+    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):342:347 -> methodDefinedInInterfaces
+    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):438:440 -> registerNewType
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> subtypes
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():451:451 -> withSubtyping
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.graph.c$a:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
@@ -15485,16 +15487,17 @@
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
     1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):49:49 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):39:50 -> <init>
-    1:11:void setLevel(int):65:75 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):80:83 -> a
-    16:18:boolean isInterface():95:97 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):107:109 -> a
-    1:1:void tagAsInteface():91:91 -> b
-    1:1:void tagAsSubtypeRoot():87:87 -> c
-    1:2:void ensureDirectSubTypeSet():59:60 -> d
-    1:1:java.lang.String toString():55:55 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.graph.d:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -15558,7 +15561,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):70:70 -> <init>
     2:42:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48:88 -> <init>
     1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93:93 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):61 -> a
     2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):93 -> a
     3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):62:62 -> a
@@ -15580,7 +15583,7 @@
     25:25:void setVerticallyMergedClasses(com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses):283:283 -> a
     26:28:com.android.tools.r8.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300:302 -> a
     1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102:102 -> b
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> b
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> b
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):61 -> b
     2:2:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> b
     3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):62:62 -> b
@@ -15648,7 +15651,7 @@
     8:19:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):101:112 -> a
     20:21:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):121:122 -> a
     20:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
-    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):356:356 -> a
+    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):363:363 -> a
     22:22:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):122 -> a
     22:22:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
     23:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):123:124 -> a
@@ -15669,10 +15672,11 @@
     17:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):57:58 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
 com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.graph.j:
+    1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>():9:13 -> <init>
-    1:1:boolean equals(java.lang.Object):40:40 -> equals
-    1:1:void flushCachedValues():35:35 -> flushCachedValues
-    1:7:int hashCode():21:27 -> hashCode
+    1:1:boolean equals(java.lang.Object):42:42 -> equals
+    1:1:void flushCachedValues():37:37 -> flushCachedValues
+    1:10:int hashCode():21:30 -> hashCode
 com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.k:
     java.util.List localVariables -> f
     java.util.List tryCatchRanges -> e
@@ -15690,10 +15694,10 @@
     13:13:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
     13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200 -> a
     14:15:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202:203 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():312 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():313 -> a
     16:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():313:313 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():314:314 -> a
     17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
     18:34:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208:224 -> a
     35:48:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):218:231 -> a
@@ -15994,7 +15998,7 @@
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
     2:2:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
-    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     3:3:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
     4:5:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
     6:6:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
@@ -16264,12 +16268,12 @@
     68:70:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):683:685 -> a
     71:77:boolean isResolvable(com.android.tools.r8.graph.AppView):709:715 -> a
     78:78:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    78:78:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270 -> a
+    78:78:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> a
     78:78:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
-    79:79:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):271:271 -> a
+    79:79:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):277:277 -> a
     79:79:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
     80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    80:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):270 -> a
+    80:80:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> a
     80:80:boolean isResolvable(com.android.tools.r8.graph.AppView):716 -> a
     81:84:boolean isResolvable(com.android.tools.r8.graph.AppView):722:725 -> a
     85:92:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):742:749 -> a
@@ -16308,7 +16312,7 @@
     57:57:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     58:59:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):274:275 -> b
     58:59:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
-    60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> b
+    60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> b
     60:60:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275 -> b
     60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     61:62:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275:276 -> b
@@ -16846,262 +16850,263 @@
     com.android.tools.r8.OptionalBool isLibraryMethodOverride -> k
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> n
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:46:void <clinit>():79:124 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):200:200 -> <init>
-    2:75: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):134:207 -> <init>
-    76:77: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):217:218 -> <init>
-    1:2:boolean hasAnnotation():1060:1061 -> A
-    1:2:boolean hasClassFileVersion():532:533 -> B
-    1:1:boolean hasCode():512:512 -> C
-    1:1:boolean hasParameterInfo():467:467 -> D
-    1:2:boolean isClassInitializer():270:271 -> E
+    1:46:void <clinit>():80:125 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):201:201 -> <init>
+    2:75: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):135:208 -> <init>
+    76:77: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):218:219 -> <init>
+    1:2:boolean hasAnnotation():1082:1083 -> A
+    1:2:boolean hasClassFileVersion():570:571 -> B
+    1:1:boolean hasCode():550:550 -> C
+    1:1:boolean hasParameterInfo():505:505 -> D
+    1:2:boolean isClassInitializer():271:272 -> E
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> E
-    3:3:boolean isClassInitializer():271 -> E
-    4:4:boolean isClassInitializer():271:271 -> E
-    1:1:boolean isDefaultMethod():276:276 -> F
-    2:2:boolean isAbstract():247:247 -> F
-    2:2:boolean isDefaultMethod():276 -> F
-    3:3:boolean isDefaultMethod():276:276 -> F
-    1:2:boolean isDirectMethod():321:322 -> G
+    3:3:boolean isClassInitializer():272 -> E
+    4:4:boolean isClassInitializer():272:272 -> E
+    1:1:boolean isDefaultMethod():277:277 -> F
+    2:2:boolean isAbstract():248:248 -> F
+    2:2:boolean isDefaultMethod():277 -> F
+    3:3:boolean isDefaultMethod():277:277 -> F
+    1:2:boolean isDirectMethod():322:323 -> G
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> G
-    3:3:boolean isDirectMethod():322 -> G
-    4:4:boolean isDirectMethod():322:322 -> G
-    1:1:boolean isFinal():251:251 -> H
-    1:2:boolean isInitializer():255:256 -> I
-    1:2:boolean isInstanceInitializer():260:261 -> J
+    3:3:boolean isDirectMethod():323 -> G
+    4:4:boolean isDirectMethod():323:323 -> G
+    1:1:boolean isFinal():252:252 -> H
+    1:2:boolean isInitializer():256:257 -> I
+    1:2:boolean isInstanceInitializer():261:262 -> J
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> J
-    3:3:boolean isInstanceInitializer():261 -> J
-    4:4:boolean isInstanceInitializer():261:261 -> J
-    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():222:222 -> K
-    1:2:boolean isNonAbstractNonNativeMethod():298:299 -> L
-    1:2:boolean isNonAbstractVirtualMethod():293:294 -> M
-    1:1:boolean isObsolete():159:159 -> N
-    1:1:boolean isOnlyInlinedIntoNestMembers():346:346 -> O
-    1:2:boolean isPrivateMethod():313:314 -> P
-    1:2:boolean isProcessed():242:243 -> Q
-    1:2:boolean isPublicMethod():308:309 -> R
-    1:2:boolean isPublicized():303:304 -> S
-    1:2:boolean isStatic():327:328 -> T
-    1:2:boolean isSyntheticMethod():341:342 -> U
-    1:2:boolean isVirtualMethod():284:285 -> V
+    3:3:boolean isInstanceInitializer():262 -> J
+    4:4:boolean isInstanceInitializer():262:262 -> J
+    1:1:com.android.tools.r8.OptionalBool isLibraryMethodOverride():223:223 -> K
+    1:2:boolean isNonAbstractNonNativeMethod():299:300 -> L
+    1:2:boolean isNonAbstractVirtualMethod():294:295 -> M
+    1:1:boolean isObsolete():160:160 -> N
+    1:1:boolean isOnlyInlinedIntoNestMembers():347:347 -> O
+    1:2:boolean isPrivateMethod():314:315 -> P
+    1:2:boolean isProcessed():243:244 -> Q
+    1:2:boolean isPublicMethod():309:310 -> R
+    1:2:boolean isPublicized():304:305 -> S
+    1:2:boolean isStatic():328:329 -> T
+    1:2:boolean isSyntheticMethod():342:343 -> U
+    1:2:boolean isVirtualMethod():285:286 -> V
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
-    3:3:boolean isVirtualMethod():285 -> V
-    1:2:void markNotProcessed():415:416 -> W
-    1:2:java.lang.String qualifiedName():544:545 -> X
-    1:2:void removeCode():521:522 -> Y
-    1:5:void setLibraryMethodOverride():226:230 -> Z
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):79:79 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):79:79 -> a
-    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):234:236 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    3:3:boolean isVirtualMethod():286 -> V
+    1:2:void markNotProcessed():453:454 -> W
+    1:2:java.lang.String qualifiedName():582:583 -> X
+    1:2:void removeCode():559:560 -> Y
+    1:5:void setLibraryMethodOverride():227:231 -> Z
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
+    3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
-    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1294 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295:1295 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1316 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
     8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1295 -> a
-    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1296:1296 -> a
-    10:11:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):351:352 -> a
-    12:37:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):357:382 -> a
-    38:38:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):380:380 -> a
-    39:39:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):378:378 -> a
-    40:40:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping):376:376 -> a
-    41:60:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):389:408 -> a
-    61:61:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):405:405 -> a
-    62:62:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):402:402 -> a
-    63:63:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):399:399 -> a
-    64:64:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):396:396 -> a
-    65:83:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):393:411 -> a
-    84:85:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):420:421 -> a
-    86:87:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):430:431 -> a
-    88:88:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
-    88:88:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):431 -> a
-    89:89:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):434:434 -> a
-    90:90:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):432:432 -> a
-    91:94:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):439:442 -> a
-    95:95:boolean hasParameterInfo():467:467 -> a
-    95:95:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442 -> a
-    96:97:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):442:443 -> a
-    98:99:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):462:463 -> a
-    98:99:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):443 -> a
-    100:100:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):445:445 -> a
-    101:103:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):449:451 -> a
-    104:109:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):499:504 -> a
-    110:118:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):554:562 -> a
-    119:131:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):566:578 -> a
-    132:189:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
-    132:189:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579 -> a
-    190:193:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):579:582 -> a
-    194:203:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):609:618 -> a
-    204:205:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):673:674 -> a
-    206:210:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):693:697 -> a
-    206:210:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    211:218:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):696:703 -> a
-    211:218:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    219:225:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):702:708 -> a
-    219:225:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    226:241:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):706:721 -> a
-    226:241:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    242:242:void setObsolete():165:165 -> a
-    242:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):722 -> a
-    242:242:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):723:723 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):674 -> a
-    244:244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676:676 -> a
-    245:249:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):727:731 -> a
-    245:249:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    250:258:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):730:738 -> a
-    250:258:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    259:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):735:743 -> a
-    259:267:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    268:276:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):740:748 -> a
-    268:276:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    277:281:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):746:750 -> a
-    277:281:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    282:283:boolean isStaticMember():333:334 -> a
-    282:283:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):751 -> a
-    282:283:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    284:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):755:777 -> a
-    284:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    307:307:void setObsolete():165:165 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    308:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:779 -> a
-    308:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):676 -> a
-    309:313:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):681:685 -> a
-    314:318:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):684:688 -> a
-    319:319:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    319:319:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688 -> a
-    320:320:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):688:688 -> a
-    321:322:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):783:784 -> a
-    323:337:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):788:802 -> a
-    338:356:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):818:836 -> a
-    357:357:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    357:357:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):836 -> a
-    358:358:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837:837 -> a
-    359:359:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    359:359:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):837 -> a
-    360:360:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838:838 -> a
-    361:361:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
-    361:361:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):838 -> a
-    362:362:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):839:839 -> a
-    363:368:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):844:849 -> a
-    369:392:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):846:869 -> a
-    393:393:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):854:854 -> a
-    394:397:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):857:860 -> a
-    398:398:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    398:398:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    398:398:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    399:399:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    399:399:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):861 -> a
-    400:402:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):862:864 -> a
-    403:403:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    403:403:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864 -> a
-    404:405:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):864:865 -> a
-    406:408:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):873:875 -> a
-    409:412:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):885:888 -> a
-    413:413:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    413:413:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):888 -> a
-    414:415:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):889:890 -> a
-    416:416:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    416:416:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):890 -> a
-    417:419:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):891:893 -> a
-    420:424:void lambda$toEmulateInterfaceLibraryMethod$3(com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):904:908 -> a
-    425:430:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):946:951 -> a
-    431:431:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
-    431:431:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
-    431:431:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):951 -> a
-    432:439:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):953:960 -> a
-    440:440:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
-    440:440:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):960 -> a
-    441:460:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:982 -> a
-    461:461:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
-    461:461:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
-    462:462:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984:984 -> a
-    463:463:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    463:463:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984 -> a
-    464:464:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):987:987 -> a
-    465:476:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1004:1015 -> a
-    477:487:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1014:1024 -> a
-    488:491:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1065:1068 -> a
-    492:492:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    492:492:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1068 -> a
-    493:493:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1070:1070 -> a
-    494:495:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1146:1147 -> a
-    496:496:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1169:1169 -> a
-    497:498:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> a
-    497:498:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171 -> a
-    499:503:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1171:1175 -> a
-    504:504:boolean hasSingleTarget():1318:1318 -> a
-    505:506:void forEachTarget(java.util.function.Consumer):1330:1331 -> a
-    1:1:void setObsolete():165:165 -> a0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):173:177 -> b
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
+    10:11:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:356 -> a
+    12:69:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:422 -> a
+    70:73:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:413 -> a
+    74:77:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):403:406 -> a
+    78:81:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):396:399 -> a
+    82:111:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):389:418 -> a
+    112:131:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):427:446 -> a
+    132:132:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):443:443 -> a
+    133:133:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):440:440 -> a
+    134:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):437:437 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):434:434 -> a
+    136:154:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):431:449 -> a
+    155:156:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):458:459 -> a
+    157:158:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):468:469 -> a
+    159:159:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
+    159:159:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):469 -> a
+    160:160:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):472:472 -> a
+    161:161:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):470:470 -> a
+    162:165:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):477:480 -> a
+    166:166:boolean hasParameterInfo():505:505 -> a
+    166:166:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480 -> a
+    167:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480:481 -> a
+    169:170:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):500:501 -> a
+    169:170:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):481 -> a
+    171:171:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):483:483 -> a
+    172:174:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):487:489 -> a
+    175:180:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):537:542 -> a
+    181:189:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):592:600 -> a
+    190:202:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:616 -> a
+    203:260:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
+    203:260:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
+    261:264:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617:620 -> a
+    265:274:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:656 -> a
+    275:276:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):711:712 -> a
+    277:281:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):731:735 -> a
+    277:281:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    282:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):734:741 -> a
+    282:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    290:296:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):740:746 -> a
+    290:296:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    297:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):744:759 -> a
+    297:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    313:313:void setObsolete():166:166 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):760 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):761:761 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714:714 -> a
+    316:320:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):765:769 -> a
+    316:320:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    321:329:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
+    321:329:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    330:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
+    330:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    339:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:786 -> a
+    339:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    348:352:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784:788 -> a
+    348:352:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    353:354:boolean isStaticMember():334:335 -> a
+    353:354:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):789 -> a
+    353:354:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    355:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):793:815 -> a
+    355:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    378:378:void setObsolete():166:166 -> a
+    378:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):816 -> a
+    378:378:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    379:379:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):817:817 -> a
+    379:379:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
+    380:384:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):719:723 -> a
+    385:389:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):722:726 -> a
+    390:390:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    390:390:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726 -> a
+    391:391:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726:726 -> a
+    392:393:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):821:822 -> a
+    394:408:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):826:840 -> a
+    409:427:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:874 -> a
+    428:428:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    428:428:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):874 -> a
+    429:429:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875:875 -> a
+    430:430:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    430:430:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876:876 -> a
+    432:432:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876 -> a
+    433:433:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):877:877 -> a
+    434:439:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):882:887 -> a
+    440:463:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:907 -> a
+    464:464:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):892:892 -> a
+    465:468:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:898 -> a
+    469:469:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    469:469:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    469:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    470:470:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    470:470:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
+    471:473:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):900:902 -> a
+    474:474:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut() -> a
+    474:474:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902 -> a
+    475:476:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902:903 -> a
+    477:479:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):911:913 -> a
+    480:483:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):922:925 -> a
+    484:484:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    484:484:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):925 -> a
+    485:486:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):926:927 -> a
+    487:487:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    487:487:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):927 -> a
+    488:492:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):928:932 -> a
+    493:497:com.android.tools.r8.graph.DexEncodedMethod toEmulateInterfaceLibraryMethod(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):929:933 -> a
+    498:503:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968:973 -> a
+    504:504:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    504:504:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    504:504:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):973 -> a
+    505:512:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):975:982 -> a
+    513:513:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    513:513:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):982 -> a
+    514:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:1004 -> a
+    534:534:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004 -> a
+    535:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006:1006 -> a
+    536:536:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1006 -> a
+    537:537:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1009:1009 -> a
+    538:549:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1026:1037 -> a
+    550:560:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1036:1046 -> a
+    561:564:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1087:1090 -> a
+    565:565:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    565:565:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090 -> a
+    566:566:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1092:1092 -> a
+    567:568:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1168:1169 -> a
+    569:569:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1191 -> a
+    570:571:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> a
+    570:571:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193 -> a
+    572:576:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1193:1197 -> a
+    577:577:boolean hasSingleTarget():1340:1340 -> a
+    578:579:void forEachTarget(java.util.function.Consumer):1352:1353 -> a
+    1:1:void setObsolete():166:166 -> a0
+    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):174:178 -> b
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178:179 -> b
-    9:12:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):455:458 -> b
-    13:14:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> b
-    13:14:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458 -> b
-    15:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):458:458 -> b
-    16:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):915:936 -> b
+    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):178 -> b
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):179:180 -> b
+    9:12:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):493:496 -> b
+    13:14:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> b
+    13:14:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496 -> b
+    15:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496:496 -> b
+    16:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:958 -> b
     38:38:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> b
-    38:38:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):936 -> b
-    39:40:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):937:938 -> b
+    38:38:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):958 -> b
+    39:40:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:960 -> b
     41:41:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> b
-    41:41:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):938 -> b
-    42:45:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939:942 -> b
-    46:49:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):976:979 -> b
-    50:50:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1312:1312 -> b
-    1:1:boolean shouldNotHaveCode():508:508 -> b0
-    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> c
-    2:5:void upgradeClassFileVersion(int):537:540 -> c
-    6:6:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):833:833 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1306:1306 -> c
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():592:598 -> c0
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):960 -> b
+    42:45:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:964 -> b
+    46:49:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):998:1001 -> b
+    50:50:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1334:1334 -> b
+    1:1:boolean shouldNotHaveCode():546:546 -> b0
+    1:1:com.android.tools.r8.graph.Code access$300(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> c
+    2:5:void upgradeClassFileVersion(int):575:578 -> c
+    6:6:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):871:871 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1328:1328 -> c
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:636 -> c0
     8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():598 -> c0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():599:599 -> c0
-    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):483:489 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):494:494 -> collectMixedSectionItems
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> d
-    2:5:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):930:933 -> d
-    6:6:boolean isValidVirtualTargetForDynamicDispatch():1301:1301 -> d
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():663:669 -> d0
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> e
-    2:3:java.util.List asListOfTargets():1324:1325 -> e
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():639:648 -> e0
-    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> f
-    1:6:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():991:996 -> f0
-    7:7:void setObsolete():165:165 -> f0
-    7:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():997 -> f0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1180:1180 -> g
-    1:1:void unsetObsolete():192:192 -> g0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1055:1055 -> h
-    1:1:void checkIfObsolete():153:153 -> h0
-    1:1:boolean isDexEncodedMethod():1049:1049 -> k
-    1:2:boolean isStaticMember():333:334 -> l
-    1:2:com.android.tools.r8.graph.DexReference toReference():1043:1044 -> m
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> n
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1038:1038 -> n
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():79 -> n
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():652:659 -> o
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():628:629 -> p
-    1:2:java.lang.String codeToString():1030:1031 -> q
-    1:2:java.lang.String descriptor():549:550 -> r
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1151:1152 -> s
-    1:3:int getClassFileVersion():526:528 -> t
-    1:2:java.lang.String toSourceString():587:588 -> toSourceString
-    1:2:java.lang.String toString():476:477 -> toString
-    1:2:com.android.tools.r8.graph.Code getCode():516:517 -> u
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():169:169 -> v
-    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1157:1165 -> w
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1138:1142 -> x
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1133:1134 -> y
-    1:1:java.util.Map getParameterInfo():471:471 -> z
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> c0
+    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:527 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):532:532 -> collectMixedSectionItems
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$400(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> d
+    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):952:955 -> d
+    6:6:boolean isValidVirtualTargetForDynamicDispatch():1323:1323 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():701:707 -> d0
+    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> e
+    2:3:java.util.List asListOfTargets():1346:1347 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():677:686 -> e0
+    1:1:int access$600(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> f
+    1:6:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1013:1018 -> f0
+    7:7:void setObsolete():166:166 -> f0
+    7:7:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1019 -> f0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1202:1202 -> g
+    1:1:void unsetObsolete():193:193 -> g0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1077:1077 -> h
+    1:1:void checkIfObsolete():154:154 -> h0
+    1:1:boolean isDexEncodedMethod():1071:1071 -> k
+    1:2:boolean isStaticMember():334:335 -> l
+    1:2:com.android.tools.r8.graph.DexReference toReference():1065:1066 -> m
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> n
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1060:1060 -> n
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():80 -> n
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:697 -> o
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():666:667 -> p
+    1:2:java.lang.String codeToString():1052:1053 -> q
+    1:2:java.lang.String descriptor():587:588 -> r
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1173:1174 -> s
+    1:3:int getClassFileVersion():564:566 -> t
+    1:2:java.lang.String toSourceString():625:626 -> toSourceString
+    1:2:java.lang.String toString():514:515 -> toString
+    1:2:com.android.tools.r8.graph.Code getCode():554:555 -> u
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():170:170 -> v
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1179:1187 -> w
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1160:1164 -> x
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1155:1156 -> y
+    1:1:java.util.Map getParameterInfo():509:509 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.S$a:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
-    1:1:void <clinit>():391:391 -> <clinit>
-    2:2:void <clinit>():372:372 -> <clinit>
+    1:1:void <clinit>():429:429 -> <clinit>
+    2:2:void <clinit>():384:384 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.S$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17112,29 +17117,29 @@
     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>():1183:1183 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1183:1183 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1194:1210 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1206:1206 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1183:1183 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1215:1215 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1224:1243 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1243 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1248 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1219:1219 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246 -> a
-    28:28:void setCode(com.android.tools.r8.graph.Code):1273:1273 -> a
-    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1277:1282 -> a
-    35:41:com.android.tools.r8.graph.DexEncodedMethod build():1281:1287 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253:1253 -> b
+    1:1:void <clinit>():1205:1205 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1205:1205 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1216:1232 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1228:1228 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1205:1205 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1246:1265 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1265 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268:1270 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1241:1241 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1268 -> a
+    28:28:void setCode(com.android.tools.r8.graph.Code):1295:1295 -> a
+    29:34:com.android.tools.r8.graph.DexEncodedMethod build():1299:1304 -> a
+    35:41:com.android.tools.r8.graph.DexEncodedMethod build():1303:1309 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275:1275 -> b
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1253 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1258:1258 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1263:1267 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1275 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetOptimizationInfo():1280:1280 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1285:1289 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.graph.S$c:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1082:1083 -> <init>
+    1:2:void <init>(boolean):1104:1105 -> <init>
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.S$d:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -17144,23 +17149,23 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():93:116 -> <clinit>
-    25:25:void <clinit>():89:89 -> <clinit>
-    1:1:void <init>(java.lang.String,int):89:89 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():89:89 -> a
+    1:24:void <clinit>():94:117 -> <clinit>
+    25:25:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.lang.String,int):90:90 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.graph.S$e:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1087:1087 -> <init>
-    2:2:void <init>():1089:1089 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1109:1109 -> <init>
+    2:2:void <init>():1111:1111 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.graph.S$e$a:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1121:1122 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.S$e$b:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1104:1104 -> <clinit>
-    1:1:void <init>():1107:1107 -> <init>
+    1:1:void <clinit>():1126:1126 -> <clinit>
+    1:1:void <init>():1129:1129 -> <init>
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexString name -> e
@@ -17173,17 +17178,17 @@
     4:4:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):63:63 -> a
     5:13:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     14:14:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:109 -> a
-    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     15:15:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     16:16:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113:113 -> a
     17:17:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     17:17:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
     18:18:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117:117 -> a
-    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117 -> a
     20:20:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
-    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     22:22:boolean match(com.android.tools.r8.graph.DexEncodedField):127:127 -> a
     23:23:boolean match(com.android.tools.r8.graph.DexField):122:122 -> a
@@ -17216,375 +17221,381 @@
     1:1:java.lang.String toSmaliString():60:60 -> toSmaliString
     1:1:java.lang.String toSourceString():64:64 -> toSourceString
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.V:
-    com.android.tools.r8.graph.DexString newInstanceName -> A0
+    com.android.tools.r8.graph.DexString getMethodName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> b1
-    com.android.tools.r8.graph.DexType mapType -> F2
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
+    com.android.tools.r8.graph.DexType proxyType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> I0
-    com.android.tools.r8.graph.DexString mapDescriptor -> j1
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> R3
-    com.android.tools.r8.graph.DexString getNameName -> r0
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> I0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> j1
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType boxedByteType -> V1
-    com.android.tools.r8.graph.DexType stringBufferType -> w2
+    com.android.tools.r8.graph.DexType longType -> V1
+    com.android.tools.r8.graph.DexType classType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> z0
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> b3
-    com.android.tools.r8.graph.DexType comparableType -> O3
-    com.android.tools.r8.graph.DexType charType -> N1
-    com.android.tools.r8.graph.DexType iterableType -> o2
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> z0
+    java.util.Set libraryTypesAssumedToBePresent -> g4
+    com.android.tools.r8.graph.DexType lookupType -> O3
+    com.android.tools.r8.graph.DexType charArrayType -> N1
+    com.android.tools.r8.graph.DexType enumType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType metafactoryType -> G3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    com.android.tools.r8.graph.DexType stringArrayType -> g2
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> I1
+    com.android.tools.r8.graph.DexType boxedNumberType -> g2
+    com.android.tools.r8.graph.DexString unknownTypeName -> k4
+    com.android.tools.r8.graph.DexString newUpdaterName -> I1
     com.android.tools.r8.graph.DexString toStringMethodName -> i0
-    com.android.tools.r8.graph.DexString fieldDescriptor -> Q0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> r1
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Q0
+    com.android.tools.r8.graph.DexString callableDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType annotationSignature -> x3
+    com.android.tools.r8.graph.DexType icceType -> W2
+    com.android.tools.r8.graph.DexType annotationDefault -> x3
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> Y0
-    com.android.tools.r8.graph.DexString npeDescriptor -> z1
-    com.android.tools.r8.graph.DexType throwableType -> O2
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Q3
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> A1
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString icceDescriptor -> z1
+    com.android.tools.r8.graph.DexType callableType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> b4
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> A1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> q3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexString setDescriptor -> i1
-    com.android.tools.r8.graph.DexType setType -> E2
-    com.android.tools.r8.graph.DexString stringDescriptor -> H0
-    com.android.tools.r8.graph.DexString constructorDescriptor -> P0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> q1
-    com.android.tools.r8.graph.DexString forNameMethodName -> q0
-    com.android.tools.r8.graph.DexType boxedBooleanType -> U1
-    com.android.tools.r8.graph.DexType stringBuilderType -> v2
+    com.android.tools.r8.graph.DexString proxyDescriptor -> i1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> E2
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> H0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> P0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> q1
+    com.android.tools.r8.graph.DexString nameMethodName -> q0
+    com.android.tools.r8.graph.DexType intType -> U1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexString getMethodName -> y0
-    com.android.tools.r8.graph.DexType byteType -> M1
-    com.android.tools.r8.graph.DexType collectionsType -> n2
-    com.android.tools.r8.graph.DexType externalizableType -> N3
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> a1
-    com.android.tools.r8.graph.DexType stringType -> f2
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Y3
+    com.android.tools.r8.graph.DexString getFieldName -> y0
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> f4
+    com.android.tools.r8.graph.DexType classArrayType -> n2
+    com.android.tools.r8.graph.DexType callSiteType -> N3
+    com.android.tools.r8.graph.DexString mathDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> d3
+    com.android.tools.r8.graph.DexType boxedShortType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
     com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    com.android.tools.r8.graph.DexString thisName -> H1
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> F3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> i3
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> p0
-    java.util.Map libraryMethodsWithoutSideEffects -> Y3
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> V2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> w3
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationThrows -> F3
+    com.android.tools.r8.graph.DexString ordinalMethodName -> p0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> g3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    com.android.tools.r8.graph.DexString mathDescriptor -> X0
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> y1
-    com.android.tools.r8.graph.DexType optionalType -> N2
-    com.android.tools.r8.graph.DexString invokeMethodName -> C0
-    java.util.Set libraryTypesAssumedToBePresent -> a4
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> d1
+    com.android.tools.r8.graph.DexString objectsDescriptor -> X0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> y1
+    com.android.tools.r8.graph.DexType comparatorType -> N2
+    java.util.IdentityHashMap internalSentinels -> l4
+    boolean $assertionsDisabled -> m4
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> a4
+    java.util.Map libraryMethodsWithoutSideEffects -> e4
+    com.android.tools.r8.graph.DexString newInstanceName -> C0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType listType -> D2
+    com.android.tools.r8.graph.DexType methodTypeType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> K0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> l1
+    com.android.tools.r8.graph.DexString stringDescriptor -> K0
+    com.android.tools.r8.graph.DexString listDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getSimpleNameName -> t0
+    com.android.tools.r8.graph.DexString getNameName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    com.android.tools.r8.graph.DexType voidType -> T1
-    com.android.tools.r8.graph.DexType autoCloseableType -> u2
-    com.android.tools.r8.graph.DexType serializableType -> M3
+    com.android.tools.r8.graph.DexType comparableType -> U3
+    com.android.tools.r8.graph.DexType floatType -> T1
+    com.android.tools.r8.graph.DexType strictMathType -> u2
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> i3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> h3
+    com.android.tools.r8.graph.DexType metafactoryType -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType booleanType -> L1
-    com.android.tools.r8.graph.DexType objectsType -> m2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> Z2
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> j3
-    com.android.tools.r8.graph.DexString unknownTypeName -> e4
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> C1
+    com.android.tools.r8.graph.DexType objectArrayType -> m2
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> C1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> W3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> g3
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> e2
+    com.android.tools.r8.graph.DexType boxedLongType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> E3
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> e3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> K1
-    java.util.Set libraryMethodsReturningNonNull -> X3
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
     com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> Y2
-    com.android.tools.r8.graph.DexString enumDescriptor -> S0
-    com.android.tools.r8.graph.DexString throwableDescriptor -> t1
+    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType npeType -> U2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> v3
-    com.android.tools.r8.graph.DexType runnableType -> M2
+    com.android.tools.r8.graph.DexType throwableType -> U2
+    com.android.tools.r8.graph.DexType collectionType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> c1
-    com.android.tools.r8.graph.DexString assertionsDisabled -> B0
-    com.android.tools.r8.graph.DexType serviceLoaderType -> C2
-    boolean $assertionsDisabled -> g4
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> k1
-    com.android.tools.r8.graph.DexString objectDescriptor -> J0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> c1
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> B0
+    com.android.tools.r8.graph.DexType methodHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> S3
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> s0
-    com.android.tools.r8.graph.DexType shortType -> S1
-    com.android.tools.r8.graph.DexType classLoaderType -> t2
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> l3
+    com.android.tools.r8.graph.DexString forNameMethodName -> s0
+    com.android.tools.r8.graph.DexType doubleType -> S1
+    com.android.tools.r8.graph.DexType mathType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> T3
-    com.android.tools.r8.graph.DexType annotationType -> l2
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
+    com.android.tools.r8.graph.DexType externalizableType -> T3
+    java.util.Set libraryClassesWithoutStaticInitialization -> h4
+    com.android.tools.r8.graph.DexType objectType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType enumerationType -> L3
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> B1
-    com.android.tools.r8.graph.DexType charSequenceType -> d2
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> D3
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> B1
+    com.android.tools.r8.graph.DexType boxedIntType -> d2
+    com.android.tools.r8.graph.DexType annotationSignature -> D3
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> o3
     com.android.tools.r8.graph.DexString internMethodName -> j0
+    com.android.tools.r8.graph.DexString constructorMethodName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    java.util.Set libraryMethodsReturningReceiver -> W3
-    com.android.tools.r8.graph.DexString methodDescriptor -> R0
-    com.android.tools.r8.graph.DexString arraysDescriptor -> s1
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> T2
-    com.android.tools.r8.graph.DexType annotationInnerClass -> u3
-    java.util.IdentityHashMap internalSentinels -> f4
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> R0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> s1
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> t3
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> T2
     java.util.concurrent.ConcurrentHashMap types -> b
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> Z0
-    com.android.tools.r8.graph.DexType consumerType -> L2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> q3
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> E0
-    com.android.tools.r8.graph.DexString proxyDescriptor -> f1
-    com.android.tools.r8.graph.DexType proxyType -> B2
+    com.android.tools.r8.graph.DexString iterableDescriptor -> Z0
+    com.android.tools.r8.graph.DexType mapEntryType -> L2
+    com.android.tools.r8.graph.DexString invokeMethodName -> E0
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType varHandleType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> M0
-    com.android.tools.r8.graph.DexString callableDescriptor -> n1
-    com.android.tools.r8.graph.DexType boxedIntType -> Z1
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> h3
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> V3
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> v0
-    com.android.tools.r8.graph.DexType longType -> R1
-    com.android.tools.r8.graph.DexType classType -> s2
+    com.android.tools.r8.graph.DexString objectDescriptor -> M0
+    com.android.tools.r8.graph.DexString mapDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedByteType -> Z1
+    com.android.tools.r8.graph.DexString getSimpleNameName -> v0
+    com.android.tools.r8.graph.DexType serializableType -> S3
+    com.android.tools.r8.graph.DexType charType -> R1
+    com.android.tools.r8.graph.DexType iterableType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType charArrayType -> J1
-    com.android.tools.r8.graph.DexType listIteratorType -> K3
-    com.android.tools.r8.graph.DexType enumType -> k2
-    com.android.tools.r8.graph.DexString newUpdaterName -> E1
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Z3
+    java.util.Set libraryMethodsReturningReceiver -> c4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> K3
+    com.android.tools.r8.graph.DexType stringArrayType -> k2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> k3
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> C3
-    com.android.tools.r8.graph.DexType nullValueType -> d4
-    com.android.tools.r8.graph.DexType boxedNumberType -> c2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
+    com.android.tools.r8.graph.DexType boxedFloatType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexString finalizeMethodName -> m0
-    com.android.tools.r8.graph.DexString objectsDescriptor -> U0
-    com.android.tools.r8.graph.DexString icceDescriptor -> v1
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> S2
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> t3
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> M1
+    com.android.tools.r8.graph.DexString initMethodName -> m0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> p3
+    com.android.tools.r8.graph.DexString methodDescriptor -> U0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> v1
+    com.android.tools.r8.graph.DexType optionalType -> S2
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> m3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType supplierType -> K2
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> f3
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> e1
-    com.android.tools.r8.graph.DexType comparatorType -> I2
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> D0
+    com.android.tools.r8.graph.DexType mapType -> K2
+    boolean skipNameValidationForTesting -> i4
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> e1
+    com.android.tools.r8.graph.DexType listType -> I2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexString classDescriptor -> L0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> m1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> A2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> n3
-    com.android.tools.r8.graph.DexType boxedFloatType -> Y1
-    com.android.tools.r8.graph.DexType methodTypeType -> z2
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> U3
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> l3
-    com.android.tools.r8.graph.DexString getTypeNameName -> u0
-    com.android.tools.r8.graph.DexType intType -> Q1
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> r2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> b3
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> L0
+    com.android.tools.r8.graph.DexString setDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBufferType -> A2
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Y1
+    com.android.tools.r8.graph.DexType stringBuilderType -> z2
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Z3
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> u0
+    com.android.tools.r8.graph.DexType byteType -> Q1
+    com.android.tools.r8.graph.DexType collectionsType -> r2
+    com.android.tools.r8.graph.DexType enumerationType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> P3
-    java.util.Set libraryClassesWithoutStaticInitialization -> b4
-    com.android.tools.r8.graph.DexType classArrayType -> j2
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
+    com.android.tools.r8.graph.DexType stringType -> j2
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> D1
-    com.android.tools.r8.graph.DexType iteratorType -> J3
+    com.android.tools.r8.graph.DexString npeDescriptor -> D1
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
     java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType boxedShortType -> b2
-    com.android.tools.r8.graph.DexString getClassMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> B3
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> m3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> b2
+    com.android.tools.r8.graph.DexString wrapperFieldName -> l0
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> B3
+    com.android.tools.r8.graph.DexString thisName -> L1
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    com.android.tools.r8.graph.DexString annotationDescriptor -> T0
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> u1
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> o3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> W2
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> R2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> s3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> T0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> u1
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> v3
+    com.android.tools.r8.graph.DexType runnableType -> R2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> f3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> w3
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType callableType -> J2
-    com.android.tools.r8.graph.DexType collectionType -> H2
+    com.android.tools.r8.graph.DexType setType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> G0
-    com.android.tools.r8.graph.DexString listDescriptor -> h1
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> p1
-    com.android.tools.r8.graph.DexType boxedDoubleType -> X1
-    com.android.tools.r8.graph.DexType methodHandleType -> y2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> G0
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> h1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e3
+    com.android.tools.r8.graph.DexType npeType -> a3
+    com.android.tools.r8.graph.DexString classDescriptor -> O0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> p1
+    com.android.tools.r8.graph.DexType voidType -> X1
+    com.android.tools.r8.graph.DexType autoCloseableType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> x0
-    com.android.tools.r8.graph.DexType floatType -> P1
-    com.android.tools.r8.graph.DexType strictMathType -> q2
-    com.android.tools.r8.graph.DexType objectArrayType -> i2
-    com.android.tools.r8.graph.DexType lookupType -> I3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> G1
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> X3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> x0
+    com.android.tools.r8.graph.DexType listIteratorType -> Q3
+    com.android.tools.r8.graph.DexType booleanType -> P1
+    com.android.tools.r8.graph.DexType objectsType -> q2
+    com.android.tools.r8.graph.DexType nullValueType -> j4
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> i2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> I3
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType boxedLongType -> a2
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> A3
-    com.android.tools.r8.graph.DexString nameMethodName -> o0
-    com.android.tools.r8.graph.DexType annotationThrows -> z3
+    com.android.tools.r8.graph.DexType boxedCharType -> a2
+    com.android.tools.r8.graph.DexType annotationInnerClass -> A3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> O1
+    com.android.tools.r8.graph.DexString finalizeMethodName -> o0
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> Y2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> z3
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString iterableDescriptor -> W0
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> x1
-    com.android.tools.r8.graph.DexType icceType -> Q2
-    com.android.tools.r8.graph.DexType annotationDefault -> r3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> X2
-    com.android.tools.r8.kotlin.Kotlin kotlin -> k3
-    com.android.tools.r8.graph.DexType mapEntryType -> G2
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> g1
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> F0
+    com.android.tools.r8.graph.DexString annotationDescriptor -> W0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> x1
+    com.android.tools.r8.graph.DexType consumerType -> Q2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> G2
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> g1
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    boolean skipNameValidationForTesting -> c4
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> N0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> o1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> p3
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType boxedCharType -> W1
-    com.android.tools.r8.graph.DexType varHandleType -> x2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> d3
+    com.android.tools.r8.graph.DexType shortType -> W1
+    com.android.tools.r8.graph.DexType classLoaderType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> V3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString getFieldName -> w0
-    com.android.tools.r8.graph.DexType doubleType -> O1
-    com.android.tools.r8.graph.DexType mathType -> p2
-    com.android.tools.r8.graph.DexType objectType -> h2
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> a3
-    com.android.tools.r8.graph.DexType callSiteType -> H3
+    com.android.tools.r8.graph.DexString getTypeNameName -> w0
+    com.android.tools.r8.graph.DexType annotationType -> p2
+    com.android.tools.r8.graph.DexType iteratorType -> P3
+    java.util.Set libraryMethodsReturningNonNull -> d4
+    com.android.tools.r8.graph.DexType charSequenceType -> h2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString constructorMethodName -> F1
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> c3
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexString ordinalMethodName -> n0
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> y3
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> V0
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> w1
+    com.android.tools.r8.graph.DexString getClassMethodName -> n0
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> s3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> y3
+    com.android.tools.r8.graph.DexString enumDescriptor -> V0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> P2
+    com.android.tools.r8.graph.DexType supplierType -> P2
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> u3
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:355:void <init>():65:418 -> <init>
-    356:404:void <init>():408:456 -> <init>
-    405:421:void <init>():446:462 -> <init>
-    422:440:void <init>():459:477 -> <init>
-    441:461:void <init>():468:488 -> <init>
-    462:494:void <init>():481:513 -> <init>
-    495:499:void <init>():512:516 -> <init>
-    500:503:void <init>():515:518 -> <init>
-    504:541:void <init>():509:546 -> <init>
-    542:544:void <init>():106:108 -> <init>
-    545:545:void <init>():107:107 -> <init>
+    2:363:void <init>():65:426 -> <init>
+    364:412:void <init>():416:464 -> <init>
+    413:429:void <init>():454:470 -> <init>
+    430:448:void <init>():467:485 -> <init>
+    449:469:void <init>():476:496 -> <init>
+    470:502:void <init>():489:521 -> <init>
+    503:507:void <init>():520:524 -> <init>
+    508:511:void <init>():523:526 -> <init>
+    512:549:void <init>():517:554 -> <init>
+    550:552:void <init>():106:108 -> <init>
+    553:553:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):421:422 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):434:436 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):523:523 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):523:523 -> a
-    10:10:void setSkipNameValidationForTesting(boolean):549:549 -> a
-    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1138:1139 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):429:430 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):442:444 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):531:531 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):531:531 -> a
+    10:10:void setSkipNameValidationForTesting(boolean):557:557 -> a
+    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1153:1154 -> a
     13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139 -> a
-    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1139:1140 -> a
-    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1145:1146 -> a
-    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1150:1151 -> a
-    20:20:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1187:1187 -> a
-    21:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1213:1214 -> a
-    23:25:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1218:1220 -> a
-    26:26:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1224:1224 -> a
-    27:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1228:1230 -> a
-    30:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1234:1237 -> a
-    34:39:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1303:1308 -> a
-    34:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1238 -> a
-    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1235:1235 -> a
-    41:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1242:1242 -> a
-    42:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1252:1255 -> a
-    46:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1254:1256 -> a
-    49:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1269:1273 -> a
-    54:63:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1290:1299 -> a
-    54:63:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1273 -> a
-    64:70:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1274:1280 -> a
-    71:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1279:1283 -> a
-    76:78:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1312:1314 -> a
-    79:79:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1318:1318 -> a
-    80:82:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1325:1327 -> a
-    83:84:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1336:1337 -> a
-    85:94:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1345:1354 -> a
-    95:97:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1358:1360 -> a
-    98:100:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1396:1398 -> a
-    101:103:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1403:1405 -> a
-    104:104:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1413:1413 -> a
-    105:107:void clearTypeLatticeElementsCache():1417:1419 -> a
-    108:115:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1446:1453 -> a
-    116:144:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1452:1480 -> a
-    145:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1460:1468 -> a
-    154:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1467:1478 -> a
-    166:167:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1485:1486 -> a
-    168:169:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1489:1490 -> a
-    170:174:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1497:1501 -> a
-    175:175:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1498:1498 -> a
-    176:182:void sort(com.android.tools.r8.naming.NamingLens):1506:1512 -> a
-    183:183:void forAllTypes(java.util.function.Consumer):1529:1529 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1191:1197 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1196:1198 -> b
+    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154 -> a
+    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1154:1155 -> a
+    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1160:1161 -> a
+    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1165:1166 -> a
+    20:20:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1202:1202 -> a
+    21:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1228:1229 -> a
+    23:25:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1233:1235 -> a
+    26:26:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    27:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1243:1245 -> a
+    30:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1249:1252 -> a
+    34:39:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1318:1323 -> a
+    34:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253 -> a
+    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1250:1250 -> a
+    41:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1257:1257 -> a
+    42:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1267:1270 -> a
+    46:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1269:1271 -> a
+    49:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1284:1288 -> a
+    54:63:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1305:1314 -> a
+    54:63:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1288 -> a
+    64:70:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1289:1295 -> a
+    71:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1294:1298 -> a
+    76:78:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1327:1329 -> a
+    79:79:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    80:82:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1340:1342 -> a
+    83:84:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1351:1352 -> a
+    85:94:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1360:1369 -> a
+    95:97:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1373:1375 -> a
+    98:100:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1411:1413 -> a
+    101:103:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1418:1420 -> a
+    104:104:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1428:1428 -> a
+    105:107:void clearTypeLatticeElementsCache():1432:1434 -> a
+    108:115:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1461:1468 -> a
+    116:144:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1467:1495 -> a
+    145:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1475:1483 -> a
+    154:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1482:1493 -> a
+    166:167:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1500:1501 -> a
+    168:169:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1504:1505 -> a
+    170:174:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1512:1516 -> a
+    175:175:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1513:1513 -> a
+    176:182:void sort(com.android.tools.r8.naming.NamingLens):1521:1527 -> a
+    183:183:void forAllTypes(java.util.function.Consumer):1544:1544 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1206:1212 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1211:1213 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1198:1199 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1205:1205 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1364:1366 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1388:1388 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1409:1409 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):557:557 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1155:1155 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1209:1209 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1370:1372 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1392:1392 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1186:1187 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1186:1186 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1376:1378 -> d
-    1:5:java.util.Collection extractMarker():1161:1165 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1382:1384 -> e
-    1:5:java.util.List extractMarkers():1175:1179 -> f
-    1:1:boolean getSkipNameValidationForTesting():553:553 -> g
-    1:10:void resetSortedIndices():1516:1525 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1423:1425 -> i
-    1:12:java.util.Set boxedValueOfMethods():431:442 -> j
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1213:1214 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1220:1220 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1379:1381 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1403:1403 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1424:1424 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1170:1170 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1224:1224 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1385:1387 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1407:1407 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1201:1202 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1201:1201 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1391:1393 -> d
+    1:5:java.util.Collection extractMarker():1176:1180 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1397:1399 -> e
+    1:5:java.util.List extractMarkers():1190:1194 -> f
+    1:1:boolean getSkipNameValidationForTesting():561:561 -> g
+    1:10:void resetSortedIndices():1531:1540 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1438:1440 -> i
+    1:12:java.util.Set boxedValueOfMethods():439:450 -> j
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.V$a:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.V$b:
     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):600:600 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):604:609 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):615:615 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):619:624 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.V$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):814:814 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):820:839 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):843:843 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):829:829 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):835:854 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):858:858 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.V$d:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
@@ -17600,47 +17611,47 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getMembers -> m
     java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):643:643 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):660:689 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):643:643 -> a
-    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):693:693 -> a
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):697:697 -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):658:658 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):675:704 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):658:658 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):708:708 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):712:712 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.V$e:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):701:701 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):705:707 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):716:716 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):720:722 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.V$f:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):715:715 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):722:742 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):737:757 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.V$g:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):570:570 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):574:578 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):578:578 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):582:586 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):584:584 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.V$h:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):560:560 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):564:566 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):565:565 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):568:568 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):572:574 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):573:573 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.V$i:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):750:750 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):754:756 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):765:765 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):769:771 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.V$j:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):614:614 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):621:628 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):629:629 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):636:643 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.V$k:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):633:633 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):637:639 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):638:638 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):648:648 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):652:654 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):653:653 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.V$l:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -17649,9 +17660,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):1026:1061 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1069:1079 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1086:1091 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1041:1076 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1084:1094 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1101:1106 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.V$m:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
@@ -17662,24 +17673,24 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):770:770 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):782:802 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):806:806 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):785:785 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):797:817 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):821:821 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.V$n:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1095:1095 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1099:1104 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1101:1101 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1110:1110 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1114:1119 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1116:1116 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.V$o:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1108:1108 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1115:1121 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1127 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1124:1129 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1133:1133 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1123:1123 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1130:1136 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1134:1142 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1144 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1148:1148 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.V$p:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -17702,13 +17713,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>():918:918 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):918:918 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):942:986 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):991:991 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):995:1021 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):918:918 -> b
+    1:1:void <clinit>():933:933 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):933:933 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):957:1001 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1006:1006 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1010:1036 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):933:933 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.V$q:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -17728,16 +17739,18 @@
     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):847:847 -> <init>
-    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):870:913 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):862:862 -> <init>
+    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):885:928 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.V$r:
-    com.android.tools.r8.graph.DexMethod initCause -> c
-    com.android.tools.r8.graph.DexMethod getSuppressed -> b
+    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):584:584 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):590:592 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):591:594 -> <init>
-    9:11:void <init>(com.android.tools.r8.graph.DexItemFactory):593:595 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):592:592 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):599:601 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):600:603 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):602:609 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):607:607 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.W:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -17786,7 +17799,7 @@
     4:4:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
     5:13:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> a
     14:14:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
-    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     15:15:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     16:16:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
     17:17:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
@@ -17796,7 +17809,7 @@
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
     20:20:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     22:22:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
     23:23:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
@@ -18021,23 +18034,10 @@
     14:16:void computeStaticValues():308:310 -> b0
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> c
     4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):276:278 -> c
-    7:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:340 -> c
-    9:9:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    9:9:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> c
-    10:12:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:351 -> c
-    10:12:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    13:13:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    13:13:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> c
-    13:13:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    14:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> c
-    14:16:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> c
-    17:17:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
-    17:17:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    18:18:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
-    18:18:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
-    18:18:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
-    19:22:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
-    19:22:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342 -> c
+    7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
+    8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
+    8:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
+    9:12:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
     1:2:int getInitialClassFileVersion():397:398 -> c0
     1:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:133 -> collectIndexedItems
     9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> collectIndexedItems
@@ -18047,11 +18047,22 @@
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137 -> collectIndexedItems
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):139:151 -> collectIndexedItems
     1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):168:171 -> collectMixedSectionItems
-    1:3:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
-    4:6:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
-    7:7:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> d
-    8:9:void setInitialClassFileVersion(int):388:389 -> d
+    1:2:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):339:340 -> d
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    3:3:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):341 -> d
+    4:6:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):349:351 -> d
+    4:6:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    7:7:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    7:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351 -> d
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    8:10:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):351:353 -> d
+    8:10:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):344 -> d
+    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> d
+    12:14:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
+    15:17:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
+    18:19:void setInitialClassFileVersion(int):388:389 -> d
     1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> d0
+    1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
     1:1:java.util.Collection getSynthesizedFrom():163:163 -> e0
     1:5:boolean hasAnnotations():255:259 -> f0
     1:1:boolean hasClassFileVersion():393:393 -> g0
@@ -18087,12 +18098,12 @@
     1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9:9 -> a
     2:2:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:86 -> a
     2:2:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     3:3:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     3:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     4:4:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):88:88 -> a
     4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
-    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     5:5:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     5:5:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):9 -> a
     6:6:int slowCompareTo(java.lang.Object):9:9 -> a
@@ -18197,70 +18208,70 @@
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
     java.lang.String toStringCache -> d
-    1:2:void <clinit>():27:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):33:33 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString):31:35 -> <init>
-    1:4:boolean isPrimitiveArrayType():241:244 -> A
-    1:1:boolean isPrimitiveType():180:180 -> B
-    1:2:boolean isReferenceType():235:236 -> C
-    1:1:boolean isVoidType():189:189 -> D
-    1:1:java.lang.String toDescriptorString():86:86 -> E
-    1:1:char toShorty():111:111 -> F
+    1:2:void <clinit>():30:31 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):36:36 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexString):34:38 -> <init>
+    1:4:boolean isPrimitiveArrayType():244:247 -> A
+    1:1:boolean isPrimitiveType():183:183 -> B
+    1:2:boolean isReferenceType():238:239 -> C
+    1:1:boolean isVoidType():192:192 -> D
+    1:1:java.lang.String toDescriptorString():89:89 -> E
+    1:1:char toShorty():114:114 -> F
     boolean isPrimitiveType(char) -> a
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27:27 -> a
-    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):174:175 -> a
-    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30:30 -> a
+    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):177:178 -> a
+    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
     4:4:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
-    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):176 -> a
-    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):27 -> a
-    5:5:int slowCompareTo(java.lang.Object):27:27 -> a
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):72:72 -> a
+    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):179 -> a
+    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):30 -> a
+    5:5:int slowCompareTo(java.lang.Object):30:30 -> a
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):75:75 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):73 -> a
-    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):75:76 -> a
-    10:10:boolean isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    11:11:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):142:142 -> a
+    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):76 -> a
+    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):78:79 -> a
+    10:10:boolean isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    11:11:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    12:12:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):57 -> a
-    13:13:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):58:58 -> a
-    14:23:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):313:322 -> a
-    24:26:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):326:328 -> a
-    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):327:329 -> a
-    30:37:java.lang.String getPackageOrName(boolean):333:340 -> a
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):162:162 -> b
-    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):303:308 -> b
-    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):307:309 -> b
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):128:129 -> collectIndexedItems
+    12:12:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):60 -> a
+    13:13:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):61:61 -> a
+    14:23:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):319:328 -> a
+    24:26:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):332:334 -> a
+    27:29:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):333:335 -> a
+    30:37:java.lang.String getPackageOrName(boolean):339:346 -> a
+    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):165:165 -> b
+    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):309:314 -> b
+    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):313:315 -> b
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:132 -> collectIndexedItems
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> collectIndexedItems
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):129 -> collectIndexedItems
-    1:1:int compareTo(java.lang.Object):27:27 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexType):157:157 -> compareTo
-    2:2:int compareTo(java.lang.Object):27 -> compareTo
-    1:2:boolean computeEquals(java.lang.Object):45:46 -> computeEquals
-    1:1:int computeHashCode():40:40 -> computeHashCode
-    1:2:void flushCachedValues():136:137 -> flushCachedValues
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):132 -> collectIndexedItems
+    1:1:int compareTo(java.lang.Object):30:30 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexType):160:160 -> compareTo
+    2:2:int compareTo(java.lang.Object):30 -> compareTo
+    1:2:boolean computeEquals(java.lang.Object):48:49 -> computeEquals
+    1:1:int computeHashCode():43:43 -> computeHashCode
+    1:2:void flushCachedValues():139:140 -> flushCachedValues
     com.android.tools.r8.graph.DexType asDexType() -> j
     boolean isDexType() -> m
-    1:16:int elementSizeForPrimitiveArrayType():275:290 -> n
-    1:2:java.lang.String getInternalName():357:358 -> o
-    1:4:java.lang.String getName():349:352 -> p
-    1:1:int getNumberOfLeadingSquareBrackets():296:296 -> q
-    1:1:java.lang.String getPackageDescriptor():345:345 -> r
-    1:4:java.lang.String toBinaryName():90:93 -> s
-    1:4:java.lang.String getPackageName():362 -> s
-    5:8:java.lang.String toBinaryName():91:94 -> s
-    5:8:java.lang.String getPackageName():362 -> s
-    9:9:java.lang.String getPackageName():362:362 -> s
-    1:1:boolean isArrayType():225:225 -> t
-    1:1:java.lang.String toSmaliString():117:117 -> toSmaliString
-    1:9:java.lang.String toSourceString():99:107 -> toSourceString
-    1:1:java.lang.String toString():122:122 -> toString
-    1:1:boolean isBooleanType():193:193 -> u
-    1:1:boolean isClassType():230:230 -> v
-    1:10:boolean isD8R8SynthesizedClassType():252:261 -> w
-    1:1:boolean isDoubleType():221:221 -> x
-    1:1:boolean isIntType():209:209 -> y
-    1:1:boolean isLongType():217:217 -> z
+    1:16:int elementSizeForPrimitiveArrayType():281:296 -> n
+    1:2:java.lang.String getInternalName():363:364 -> o
+    1:4:java.lang.String getName():355:358 -> p
+    1:1:int getNumberOfLeadingSquareBrackets():302:302 -> q
+    1:1:java.lang.String getPackageDescriptor():351:351 -> r
+    1:4:java.lang.String toBinaryName():93:96 -> s
+    1:4:java.lang.String getPackageName():368 -> s
+    5:8:java.lang.String toBinaryName():94:97 -> s
+    5:8:java.lang.String getPackageName():368 -> s
+    9:9:java.lang.String getPackageName():368:368 -> s
+    1:1:boolean isArrayType():228:228 -> t
+    1:1:java.lang.String toSmaliString():120:120 -> toSmaliString
+    1:9:java.lang.String toSourceString():102:110 -> toSourceString
+    1:1:java.lang.String toString():125:125 -> toString
+    1:1:boolean isBooleanType():196:196 -> u
+    1:1:boolean isClassType():233:233 -> v
+    1:13:boolean isD8R8SynthesizedClassType():255:267 -> w
+    1:1:boolean isDoubleType():224:224 -> x
+    1:1:boolean isIntType():212:212 -> y
+    1:1:boolean isLongType():220:220 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.f0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
@@ -18269,7 +18280,7 @@
     1:2:void <init>():22:23 -> <init>
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):26:28 -> <init>
     1:7:int compareTo(com.android.tools.r8.graph.DexTypeList):80:86 -> a
-    8:8:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    8:8:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     8:8:int compareTo(com.android.tools.r8.graph.DexTypeList):86 -> a
     9:9:int compareTo(com.android.tools.r8.graph.DexTypeList):92:92 -> a
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):39:40 -> collectIndexedItems
@@ -18561,9 +18572,9 @@
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1026 -> a
     2:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1059:1062 -> a
-    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> a
+    6:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> a
     6:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
-    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:985 -> a
+    8:8:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:983 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.InternalOptions):1062 -> a
     1:1:boolean equals(java.lang.Object):1049:1049 -> equals
     java.lang.Object asAsmEncodedObject() -> f
@@ -19308,7 +19319,7 @@
     1:2:void visitEnd():797:798 -> c
     3:5:boolean classRequiresCode():788:790 -> c
     3:5:void visitEnd():798 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> c
     6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
     6:6:boolean classRequiresCode():790 -> c
     6:6:void visitEnd():798 -> c
@@ -19685,7 +19696,7 @@
     9:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createMap(java.util.Collection,java.util.function.Consumer):79:86 -> a
     17:28:com.android.tools.r8.graph.DexProgramClass[] sortClasses(com.android.tools.r8.graph.DexApplication,java.util.Collection):140:151 -> a
     29:31:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):146:148 -> a
-    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):157:157 -> a
+    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
     32:32:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):148 -> a
     33:33:java.util.Collection keysOrEmpty(java.util.Map):155:155 -> a
     34:34:java.util.Collection getCallSites():183:183 -> a
@@ -20420,7 +20431,7 @@
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     18:18:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     19:19:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     19:19:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     19:19:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20447,7 +20458,7 @@
     26:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     26:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     26:33:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     34:34:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     34:34:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     34:34:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20634,7 +20645,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):961:961 -> 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):959:959 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -20802,14 +20813,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):961:961 -> 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):959:959 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.w.a.n.j.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.w.a.n.j.m:
@@ -20836,12 +20847,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):975:975 -> 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):973:973 -> 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):961:961 -> 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):975 -> 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):959:959 -> 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):973 -> 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):976:976 -> 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):974:974 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -20858,25 +20869,24 @@
     boolean $assertionsDisabled -> t
     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:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():66:66 -> C
+    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:72 -> C
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayMemberTypeAsValueType():66:66 -> D
     com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement asArrayTypeLatticeElement() -> a
     1:1: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
-    2:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getArrayBaseTypeLattice():70:72 -> a
-    2:4:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40 -> a
-    5:11:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):42:48 -> a
-    12:13:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
-    14:14:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
-    15:19:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
-    15:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
-    20:31: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
-    32:42: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
-    43:55: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
-    56:58: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
-    56:58: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
-    59:61: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
-    59:61: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
-    62:63: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
-    62: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):186 -> a
+    2:10:com.android.tools.r8.graph.DexType getArrayType(com.android.tools.r8.graph.DexItemFactory):40:48 -> a
+    11:12:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):79:80 -> a
+    13:13:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):94:94 -> a
+    14:18:com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):135:139 -> a
+    14:18:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):15 -> a
+    19:30: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
+    31:41: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
+    42:54: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
+    55:57: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
+    55:57: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
+    58:60: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
+    58: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):188 -> a
+    61:62: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
+    61:62: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
     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 -> create
     boolean isArrayType() -> e
     1:8:boolean equals(java.lang.Object):117:124 -> equals
@@ -20975,14 +20985,26 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker):221:223 -> <init>
 com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.ir.analysis.type.c:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):30:31 -> <init>
-    1:22:void recomputeTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):39:60 -> a
-    23:33:boolean verifyAllPhiOperandsAreBottom(java.util.Set):66:76 -> a
-    34:34:boolean verifyAllPhiOperandsAreBottom(java.util.Set):72:72 -> a
-    1:8:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):85:92 -> b
+    boolean $assertionsDisabled -> c
+    java.util.function.Function mapping -> b
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):31:33 -> <init>
+    1:11:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):40:50 -> a
+    12:18:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):94:100 -> a
+    12:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):50 -> a
+    19:19:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53:53 -> a
+    20:30:boolean verifyAllPhiOperandsAreBottom(java.util.Set):76:86 -> a
+    20:30:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    31:31:boolean verifyAllPhiOperandsAreBottom(java.util.Set):82:82 -> a
+    31:31:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):53 -> a
+    32:44:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):55:67 -> a
+    45:45:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    45:45:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67 -> a
+    46:50:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):67:71 -> a
+    51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71 -> a
+    52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71:71 -> a
 com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
@@ -21116,28 +21138,29 @@
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> b
     boolean mayHaveImpreciseTypes -> a
     1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):48:48 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):38:50 -> <init>
-    1:2:void analyze():54:55 -> a
-    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):131:136 -> a
-    3:8:void analyze():55 -> a
-    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):60:63 -> a
-    13:15:void narrowing(java.lang.Iterable):73:75 -> a
-    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):79:82 -> a
-    20:22:void enqueue(com.android.tools.r8.ir.code.Value):86:88 -> a
-    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):94:109 -> a
-    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    39:59:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):106:126 -> a
-    39:59:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):62 -> a
-    60:87:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):140:167 -> a
-    88:119:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):173:204 -> a
-    1:1:void widening(java.lang.Iterable):67:67 -> b
-    2:2:boolean lambda$getRefinedReceiverType$1(com.android.tools.r8.ir.code.Value):179:179 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView,boolean):49:49 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppView,boolean):39:51 -> <init>
+    1:2:void analyze():55:56 -> a
+    3:8:void analyzeValue(com.android.tools.r8.ir.code.Value):137:142 -> a
+    3:8:void analyze():56 -> a
+    9:12:void widening(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):61:64 -> a
+    13:15:void narrowing(java.lang.Iterable):74:76 -> a
+    16:19:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):85:88 -> a
+    20:22:void enqueue(com.android.tools.r8.ir.code.Value):92:94 -> a
+    23:38:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):100:115 -> a
+    23:38:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    39:59:void analyzeBasicBlock(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):112:132 -> a
+    39:59:void lambda$widening$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):63 -> a
+    60:89:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):146:175 -> a
+    90:102:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):181:193 -> a
+    1:1:boolean verifyValuesUpToDate(java.lang.Iterable):80:80 -> b
+    1:1:void widening(java.lang.Iterable):68:68 -> c
 com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.ir.analysis.type.i:
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
-    1:4:void <clinit>():30:33 -> <clinit>
+    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.k:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
@@ -21232,8 +21255,8 @@
     int requiredRegisters() -> z
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.w.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -21252,7 +21275,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.w.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -21262,9 +21285,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():56:56 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.w.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -21276,9 +21299,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> u2
-    1:1:int maxOutValueRegister():59:59 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():54:54 -> v2
+    1:1:int maxOutValueRegister():59:59 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.w.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21293,14 +21316,14 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
-    int opcode() -> w2
+    1:2:int maxInValueRegister():54:55 -> v2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.w.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> F2
-    boolean isAnd() -> P0
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -21313,14 +21336,14 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.w.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,boolean):27:29 -> <init>
     boolean hasInvariantOutType() -> I0
-    boolean isArgument() -> Q0
+    boolean isArgument() -> R0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -21334,15 +21357,15 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():52:52 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.w.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> F2
-    boolean isArithmeticBinop() -> R0
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
     26:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:86 -> a
@@ -21367,12 +21390,13 @@
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():33:33 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():264:264 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayGet() -> S0
+    boolean isArrayGet() -> T0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():53:53 -> a
@@ -21438,17 +21462,17 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.w.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayLength() -> T0
+    boolean isArrayLength() -> U0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
@@ -21468,23 +21492,23 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.w.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> B2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> B2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isArrayPut() -> U0
+    boolean isArrayPut() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():71:71 -> a
@@ -21511,24 +21535,23 @@
     1:48:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:197 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():125:125 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():125:125 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.w.b.k:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Assume$Assumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):30:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> A2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> B2
-    boolean isIntroducingAnAlias() -> C1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> B2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    boolean isIntroducingAnAlias() -> D1
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isAssume() -> V0
-    1:1:boolean isAssumeDynamicType():132:132 -> W0
-    1:1:boolean isAssumeNonNull():145:145 -> X0
+    boolean isAssume() -> W0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Assume createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):55:55 -> a
@@ -21557,7 +21580,7 @@
     1:1:boolean isAssumeDynamicType():132:132 -> c
     1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):65 -> c
     2:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
-    boolean isOutConstant() -> d2
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
     2:2:boolean isAssumeDynamicType():132:132 -> j
@@ -21575,10 +21598,10 @@
     8:8:java.lang.String toString():300 -> toString
     9:15:java.lang.String toString():300:306 -> toString
     16:16:java.lang.String toString():297:297 -> toString
-    1:1:int maxInValueRegister():209:209 -> u2
-    1:1:int maxOutValueRegister():214:214 -> v2
+    1:1:int maxInValueRegister():209:209 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():214:214 -> w2
+    int opcode() -> x2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -21645,268 +21668,281 @@
     java.util.List phis -> h
     java.util.Map incompletePhis -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:124:void <init>():53:176 -> <init>
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():221:222 -> A
-    1:2:boolean hasCatchHandlers():535:536 -> B
-    1:1:boolean hasIncompletePhis():1061:1061 -> C
-    1:1:boolean hasOneNormalExit():1447:1447 -> D
-    1:1:boolean hasPhis():519:519 -> E
-    1:1:boolean hasUniquePredecessor():217:217 -> F
-    1:2:void incrementUnfilledPredecessorCount():625:626 -> G
-    1:1:boolean isEmpty():570:570 -> H
-    1:1:boolean isFilled():527:527 -> I
-    1:1:boolean isSealed():1049:1049 -> J
-    1:11:boolean isSimpleAlwaysThrowingPath():1424:1434 -> K
-    1:1:boolean isTrivialGoto():1379:1379 -> L
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1523:1523 -> M
-    1:1:int numberOfCatchHandlers():1472:1472 -> N
-    1:2:void removeAllNormalSuccessors():282:283 -> O
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:124:void <init>():54:177 -> <init>
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():222:223 -> A
+    1:2:boolean hasCatchHandlers():536:537 -> B
+    1:1:boolean hasIncompletePhis():1096:1096 -> C
+    1:1:boolean hasOneNormalExit():1482:1482 -> D
+    1:1:boolean hasPhis():520:520 -> E
+    1:1:boolean hasUniquePredecessor():218:218 -> F
+    1:2:void incrementUnfilledPredecessorCount():660:661 -> G
+    1:1:boolean isEmpty():605:605 -> H
+    1:1:boolean isFilled():528:528 -> I
+    1:1:boolean isSealed():1084:1084 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1459:1469 -> K
+    1:1:boolean isTrivialGoto():1414:1414 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1558:1558 -> M
+    1:1:int numberOfCatchHandlers():1507:1507 -> N
+    1:2:void removeAllNormalSuccessors():283:284 -> O
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> O
-    3:3:void removeAllNormalSuccessors():283 -> O
-    4:12:void removeAllNormalSuccessors():284:292 -> O
-    1:1:void setFilledForTesting():531:531 -> P
-    1:9:java.lang.String toDetailedString():1102:1110 -> Q
-    10:10:boolean isFilled():527:527 -> Q
-    10:10:java.lang.String toDetailedString():1110 -> Q
-    11:12:java.lang.String toDetailedString():1110:1111 -> Q
-    13:13:boolean isSealed():1049:1049 -> Q
-    13:13:java.lang.String toDetailedString():1111 -> Q
-    14:51:java.lang.String toDetailedString():1111:1148 -> Q
-    52:52:int digits(int):1098:1098 -> Q
-    52:52:java.lang.String toDetailedString():1148 -> Q
-    53:88:java.lang.String toDetailedString():1148:1183 -> Q
-    1:3:void unlinkCatchHandler():739:741 -> R
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():700:704 -> S
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():710:714 -> T
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():723:728 -> U
-    1:2:boolean verifyFilledPredecessors():640:641 -> V
-    1:2:boolean notifyPredecessorsMayChangeListeners():235:236 -> W
-    1:2:boolean notifySuccessorsMayChangeListeners():196:197 -> X
-    1:1:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):84:84 -> a
-    2:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> a
-    3:3:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):89:89 -> a
-    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):179:183 -> a
-    9:26:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):258:275 -> a
+    3:3:void removeAllNormalSuccessors():284 -> O
+    4:12:void removeAllNormalSuccessors():285:293 -> O
+    1:1:void setFilledForTesting():532:532 -> P
+    1:9:java.lang.String toDetailedString():1137:1145 -> Q
+    10:10:boolean isFilled():528:528 -> Q
+    10:10:java.lang.String toDetailedString():1145 -> Q
+    11:12:java.lang.String toDetailedString():1145:1146 -> Q
+    13:13:boolean isSealed():1084:1084 -> Q
+    13:13:java.lang.String toDetailedString():1146 -> Q
+    14:51:java.lang.String toDetailedString():1146:1183 -> Q
+    52:52:int digits(int):1133:1133 -> Q
+    52:52:java.lang.String toDetailedString():1183 -> Q
+    53:88:java.lang.String toDetailedString():1183:1218 -> Q
+    1:3:void unlinkCatchHandler():774:776 -> R
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():735:739 -> S
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():745:749 -> T
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():758:763 -> U
+    1:2:boolean verifyFilledPredecessors():675:676 -> V
+    1:2:boolean notifyPredecessorsMayChangeListeners():236:237 -> W
+    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> X
+    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
+    4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):180:184 -> a
+    9:26:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):259:276 -> a
     27:27:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
-    27:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):276 -> a
-    28:45:void swapSuccessorsByIndex(int,int):305:322 -> a
-    46:53:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):437:444 -> a
-    54:57:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):448:451 -> a
+    27:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):277 -> a
+    28:45:void swapSuccessorsByIndex(int,int):306:323 -> a
+    46:53:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):438:445 -> a
+    54:57:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):449:452 -> a
     58:59:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):33:34 -> a
-    58:59:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451 -> a
-    60:65:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):451:456 -> a
+    58:59:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452 -> a
+    60:65:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):452:457 -> a
     66:66:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    66:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456 -> a
-    67:85:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:474 -> a
+    66:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457 -> a
+    67:85:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):457:475 -> a
     86:86:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    86:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476 -> a
-    87:103:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):476:492 -> a
-    104:104:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):566:566 -> a
-    105:106:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):601:602 -> a
-    107:109:void clearMark(int):614:616 -> a
-    110:110:void addPhi(com.android.tools.r8.ir.code.Phi):646:646 -> a
-    111:111:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:660 -> a
-    112:112:boolean isFilled():527:527 -> a
-    112:112:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660 -> a
-    113:116:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):660:663 -> a
-    117:117:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:667 -> a
-    118:118:boolean isFilled():527:527 -> a
-    118:118:void close(com.android.tools.r8.ir.conversion.IRBuilder):667 -> a
-    119:123:void close(com.android.tools.r8.ir.conversion.IRBuilder):667:671 -> a
+    86:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477 -> a
+    87:103:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):477:493 -> a
+    104:104:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):567:567 -> a
+    105:106:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):636:637 -> a
+    107:109:void clearMark(int):649:651 -> a
+    110:110:void addPhi(com.android.tools.r8.ir.code.Phi):681:681 -> a
+    111:111:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:695 -> a
+    112:112:boolean isFilled():528:528 -> a
+    112:112:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695 -> a
+    113:116:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):695:698 -> a
+    117:117:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:702 -> a
+    118:118:boolean isFilled():528:528 -> a
+    118:118:void close(com.android.tools.r8.ir.conversion.IRBuilder):702 -> a
+    119:123:void close(com.android.tools.r8.ir.conversion.IRBuilder):702:706 -> 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):671 -> a
-    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):672:672 -> a
-    126:127:boolean verifyNoValuesAfterThrowingInstruction():1509:1510 -> a
-    126:127:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    128:128:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> a
-    128:128:boolean verifyNoValuesAfterThrowingInstruction():1510 -> a
-    128:128:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    129:134:boolean verifyNoValuesAfterThrowingInstruction():1511:1516 -> a
-    129:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):672 -> a
-    135:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):673:673 -> a
-    136:147:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1008:1019 -> a
-    136:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):674 -> a
-    148:148:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):754:754 -> a
-    149:153:boolean isCatchHandlerForSingleGuard():780:784 -> a
-    149:153:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):755 -> a
-    154:158:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):757:761 -> a
-    159:159:boolean lambda$removeCatchHandlerWithGuard$5(int,com.android.tools.r8.ir.code.BasicBlock):772:772 -> a
-    160:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):801:810 -> a
-    170:179:void linkCatchSuccessors(java.util.List,java.util.List):849:858 -> a
-    180:183:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):862:865 -> a
-    184:194:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):875:885 -> a
-    195:196:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> a
-    195:196:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):948 -> a
-    197:199:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):950:952 -> a
-    200:218:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):973:991 -> a
-    219:223:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):998:1002 -> a
-    224:227:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1001:1004 -> a
-    228:229:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1024:1025 -> a
-    230:234:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1053:1057 -> a
-    235:242:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1070:1077 -> a
-    243:246:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1187:1190 -> a
-    247:279:void print(com.android.tools.r8.utils.CfgPrinter):1195:1227 -> a
-    280:281:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1231:1232 -> a
-    282:294:void removeInstructions(java.util.List):1253:1265 -> a
-    295:295:void setInstructions(java.util.LinkedList):1245:1245 -> a
-    295:295:void removeInstructions(java.util.List):1266 -> a
-    296:297: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):1290:1291 -> a
-    298:302:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1304:1308 -> a
-    303:309: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[]):1339:1345 -> a
-    310:319: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):1361:1370 -> a
-    320:320:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    320:320: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):1371 -> a
-    321:321:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    321:321: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):1372 -> a
-    322:323: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):1373:1374 -> a
-    324:325:boolean canThrow():1486:1487 -> a
-    326:326:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535:1535 -> a
-    327:327:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    327:327:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1535 -> a
-    328:328:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1539:1539 -> a
-    329:329:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1543:1543 -> a
-    330:330:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1554:1554 -> a
-    331:342:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1572:1583 -> a
-    343:348:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1604:1609 -> a
-    343:348:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1587 -> a
-    349:353:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1591:1595 -> a
-    354:370: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):1620:1636 -> a
-    371:401:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1685 -> a
-    371:401: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):1636 -> a
-    402:402:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    402:402:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1686 -> a
-    402:402: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):1636 -> a
-    403:406:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1687:1690 -> a
-    403:406: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):1636 -> a
-    407:407:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):656:656 -> a
-    407:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1691 -> a
-    407:407: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):1636 -> a
-    408:413:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1692:1697 -> a
-    408:413: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):1636 -> a
-    414:414:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1675 -> a
-    414: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):1636 -> a
+    124:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):706 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):707:707 -> a
+    126:127:boolean verifyNoValuesAfterThrowingInstruction():1544:1545 -> a
+    126:127:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    128:128:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> a
+    128:128:boolean verifyNoValuesAfterThrowingInstruction():1545 -> a
+    128:128:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    129:134:boolean verifyNoValuesAfterThrowingInstruction():1546:1551 -> a
+    129:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):707 -> a
+    135:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):708:708 -> a
+    136:147:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1043:1054 -> a
+    136:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    148:148:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):789:789 -> a
+    149:153:boolean isCatchHandlerForSingleGuard():815:819 -> a
+    149:153:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):790 -> a
+    154:158:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):792:796 -> a
+    159:159:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):807:807 -> a
+    160:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):836:845 -> a
+    170:179:void linkCatchSuccessors(java.util.List,java.util.List):884:893 -> a
+    180:183:void addCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):897:900 -> a
+    184:194:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):910:920 -> a
+    195:196:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> a
+    195:196:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):983 -> a
+    197:199:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):985:987 -> a
+    200:218:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1008:1026 -> a
+    219:223:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1033:1037 -> a
+    224:227:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1036:1039 -> a
+    228:229:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1059:1060 -> a
+    230:234:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1088:1092 -> a
+    235:242:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1105:1112 -> a
+    243:246:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1222:1225 -> a
+    247:279:void print(com.android.tools.r8.utils.CfgPrinter):1230:1262 -> a
+    280:281:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1266:1267 -> a
+    282:294:void removeInstructions(java.util.List):1288:1300 -> a
+    295:295:void setInstructions(java.util.LinkedList):1280:1280 -> a
+    295:295:void removeInstructions(java.util.List):1301 -> a
+    296:297: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):1325:1326 -> a
+    298:302:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1339:1343 -> a
+    303:309: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[]):1374:1380 -> a
+    310:319: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):1396:1405 -> a
+    320:320:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    320:320: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):1406 -> a
+    321:321:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    321:321: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):1407 -> a
+    322:323: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):1408:1409 -> a
+    324:325:boolean canThrow():1521:1522 -> a
+    326:326:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    327:327:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    327:327:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1570 -> a
+    328:328:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1574:1574 -> a
+    329:329:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1578:1578 -> a
+    330:330:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1589:1589 -> a
+    331:342:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1607:1618 -> a
+    343:348:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1639:1644 -> a
+    343:348:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1622 -> a
+    349:353:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1626:1630 -> a
+    354:370: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):1655:1671 -> a
+    371:401:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1720 -> a
+    371:401: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):1671 -> a
+    402:402:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    402:402:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1721 -> a
+    402:402: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):1671 -> a
+    403:406:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1722:1725 -> a
+    403:406: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):1671 -> a
+    407:407:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):691:691 -> a
+    407:407:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726 -> a
+    407:407: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):1671 -> a
+    408:413:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1727:1732 -> a
+    408:413: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):1671 -> a
+    414:414:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1710 -> a
+    414: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):1671 -> a
     415:415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    415:415:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675 -> 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):1636 -> a
-    416:450:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1675:1709 -> a
-    416:450: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):1636 -> a
+    415:415:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710 -> 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):1671 -> a
+    416:450:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1710:1744 -> a
+    416:450: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):1671 -> a
     451:451:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
-    451:451:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1711 -> a
-    451:451: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):1636 -> a
-    452:452:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1712:1712 -> a
-    452:452: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):1636 -> a
-    453:453:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1655:1655 -> a
-    453:453: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):1636 -> a
-    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):236:236 -> b
-    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):327:357 -> b
+    451:451:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    451:451: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):1671 -> a
+    452:452:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1747:1747 -> a
+    452:452: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):1671 -> a
+    453:453:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1690:1690 -> a
+    453:453: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):1671 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):237:237 -> b
+    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):328:358 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):359:359 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:360 -> b
     35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360 -> b
-    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:363 -> b
-    40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):424:428 -> b
-    40:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363 -> b
-    45:97:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):363:415 -> b
-    98:99:void removePhisByIndex(java.util.List):513:514 -> b
-    100:101:void decrementUnfilledPredecessorCount(int):630:631 -> b
-    102:103:void removePhi(com.android.tools.r8.ir.code.Phi):650:651 -> b
-    104:113:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):766:775 -> b
-    114:141:java.util.Set cleanForRemoval():815:842 -> b
-    142:143:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):935:936 -> b
-    142:143:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):942 -> b
-    144:147:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1029:1032 -> b
-    148:148:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> b
-    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):197:197 -> c
-    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:301 -> c
-    7:8:boolean isMarked(int):620:621 -> c
-    9:9:boolean blocksClean(java.util.List):686:686 -> c
-    10:12:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1274:1276 -> c
-    13:13:void clearCatchHandlers():1463:1463 -> c
-    14:26:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1814:1826 -> c
-    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):679:682 -> d
-    5:7:void clearCurrentDefinitions():921:923 -> d
-    8:8:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> d
-    9:9:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> d
-    9:9:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):566 -> d
-    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):252:254 -> e
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):361:364 -> b
+    40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):425:429 -> b
+    40:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364 -> b
+    45:97:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364:416 -> b
+    98:99:void removePhisByIndex(java.util.List):514:515 -> b
+    100:100:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):571:571 -> b
+    101:102:void decrementUnfilledPredecessorCount(int):665:666 -> b
+    103:104:void removePhi(com.android.tools.r8.ir.code.Phi):685:686 -> b
+    105:114:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):801:810 -> b
+    115:142:java.util.Set cleanForRemoval():850:877 -> b
+    143:144:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):970:971 -> b
+    143:144:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):977 -> b
+    145:148:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1064:1067 -> 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):298:302 -> c
+    7:8:boolean isMarked(int):655:656 -> c
+    9:9:boolean blocksClean(java.util.List):721:721 -> c
+    10:10:void clearCatchHandlers():1498:1498 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> c
+    12:24:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1849:1861 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):714:717 -> d
+    5:7:void clearCurrentDefinitions():956:958 -> d
+    8:10:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1309:1311 -> d
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):253:255 -> e
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> e
-    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254 -> e
-    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):254:254 -> e
-    6:7:void clearUserInfo():596:597 -> e
-    8:11:void mark(int):607:610 -> e
-    1:2:int numberInstructions(int):554:555 -> f
-    3:4:boolean consistentCatchHandlers():892:893 -> f
-    5:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> f
-    5:5:boolean consistentCatchHandlers():894 -> f
-    6:7:boolean consistentCatchHandlers():896:897 -> f
-    8:27:boolean consistentCatchHandlers():896:915 -> f
-    28:29:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1467:1468 -> f
-    1:2:void setNumber(int):545:546 -> g
-    3:4:void decrementUnfilledPredecessorCount():635:636 -> g
-    5:80:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1729:1804 -> g
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):255:255 -> e
+    6:7:void clearUserInfo():631:632 -> e
+    8:11:void mark(int):642:645 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):567 -> e
+    1:2:int numberInstructions(int):555:556 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):572:572 -> f
+    4:5:boolean consistentCatchHandlers():927:928 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> f
+    6:6:boolean consistentCatchHandlers():929 -> f
+    7:8:boolean consistentCatchHandlers():931:932 -> f
+    9:28:boolean consistentCatchHandlers():931:950 -> f
+    29:30:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1502:1503 -> f
+    1:2:void setNumber(int):546:547 -> g
+    3:4:void decrementUnfilledPredecessorCount():670:671 -> g
+    5:80:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1764:1839 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$4(com.android.tools.r8.ir.code.BasicBlock):688:689 -> h
-    3:17:void deduplicatePhis():1857:1871 -> h
-    java.lang.String lambda$toDetailedString$6(com.android.tools.r8.ir.code.BasicBlock) -> i
-    1:4:void detachAllSuccessors():793:796 -> i
-    5:6:boolean verifyOnThrowWrite(int):1499:1500 -> i
-    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1091:1092 -> j
-    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1036:1044 -> j
-    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092 -> j
-    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1092:1092 -> j
-    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1407:1409 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():574:574 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():584:585 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1527:1527 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():585 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():586:588 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():578:580 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1451:1455 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1459:1459 -> o
-    1:1:java.util.LinkedList getInstructions():562:562 -> p
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():93:93 -> q
-    1:2:java.util.List getMutablePredecessors():230:231 -> r
-    1:2:java.util.List getMutableSuccessors():191:192 -> s
-    1:7:java.util.List getNormalPredecessors():242:248 -> t
-    1:1:java.lang.String toString():1083:1083 -> toString
-    1:11:java.util.List getNormalSuccessors():203:213 -> u
-    1:2:int getNumber():540:541 -> v
-    1:1:java.lang.String getNumberAsString():550:550 -> w
-    1:1:java.util.List getPhis():523:523 -> x
-    1:1:java.util.List getPredecessors():226:226 -> y
-    1:1:java.util.List getSuccessors():187:187 -> z
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
+    3:17:void deduplicatePhis():1892:1906 -> h
+    java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock) -> i
+    1:4:void detachAllSuccessors():828:831 -> i
+    5:6:boolean verifyOnThrowWrite(int):1534:1535 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1126:1127 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1071:1079 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1127:1127 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1442:1444 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():609:609 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():619:620 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1562:1562 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():620 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():621:623 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():613:615 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1486:1490 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1494:1494 -> o
+    1:1:java.util.LinkedList getInstructions():563:563 -> p
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
+    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutableSuccessors():192:193 -> s
+    1:7:java.util.List getNormalPredecessors():243:249 -> t
+    1:1:java.lang.String toString():1118:1118 -> toString
+    1:11:java.util.List getNormalSuccessors():204:214 -> u
+    1:2:int getNumber():541:542 -> v
+    1:1:java.lang.String getNumberAsString():551:551 -> w
+    1:1:java.util.List getPhis():524:524 -> x
+    1:1:java.util.List getPredecessors():227:227 -> y
+    1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.w.b.l$a:
+    com.android.tools.r8.ir.code.Instruction next -> b
+    com.android.tools.r8.ir.code.Instruction val$instruction -> c
+    com.android.tools.r8.ir.code.BasicBlock this$0 -> d
+    com.android.tools.r8.ir.code.InstructionIterator iterator -> a
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):572:575 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():578:580 -> f
+    1:1:boolean hasNext():589:589 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():594:598 -> next
+    1:5:java.lang.Object next():572 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():596:596 -> next
+    6:6:java.lang.Object next():572 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.w.b.l$b:
 com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.w.b.l$c:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
-    1:3:void <clinit>():112:114 -> <clinit>
-    1:1:void <init>(java.lang.String,int):111:111 -> <init>
+    1:3:void <clinit>():113:115 -> <clinit>
+    1:1:void <init>(java.lang.String,int):112:112 -> <init>
 com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.w.b.l$d:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1834:1834 -> <clinit>
-    1:1:void <init>():1834:1834 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1834:1834 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1834:1834 -> doEquivalent
-    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1837:1839 -> doEquivalent
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1834 -> doEquivalent
-    1:1:int doHash(java.lang.Object):1834:1834 -> doHash
-    2:2:int doHash(com.android.tools.r8.ir.code.Phi):1849:1849 -> doHash
-    2:2:int doHash(java.lang.Object):1834 -> doHash
+    1:1:void <clinit>():1869:1869 -> <clinit>
+    1:1:void <init>():1869:1869 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1869:1869 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1869:1869 -> doEquivalent
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1872:1874 -> doEquivalent
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1869 -> doEquivalent
+    1:1:int doHash(java.lang.Object):1869:1869 -> doHash
+    2:2:int doHash(com.android.tools.r8.ir.code.Phi):1884:1884 -> doHash
+    2:2:int doHash(java.lang.Object):1869 -> doHash
     3:3:int com.android.tools.r8.ir.code.Value.hashCode():760:760 -> doHash
-    3:3:int doHash(com.android.tools.r8.ir.code.Phi):1850 -> doHash
-    3:3:int doHash(java.lang.Object):1834 -> doHash
+    3:3:int doHash(com.android.tools.r8.ir.code.Phi):1885 -> doHash
+    3:3:int doHash(java.lang.Object):1869 -> doHash
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.w.b.l$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
-    1:2:void <clinit>():103:104 -> <clinit>
-    1:1:void <init>(java.lang.String,int):102:102 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107 -> a
-    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):107:107 -> 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():330:330 -> a
+    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.w.b.m:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
@@ -21951,7 +21987,7 @@
     87:87:boolean hasNext():57:57 -> a
     87:87:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
     88:91:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
-    92:92:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    92:92:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     92:92:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
     93:93:boolean hasPrevious():73:73 -> a
     93:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
@@ -21973,7 +22009,7 @@
     204:204:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
     205:208:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487:490 -> a
     209:211:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489:491 -> a
-    212:212:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
+    212:212:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
     212:212:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
     213:245:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492:524 -> a
     246:246:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
@@ -21982,22 +22018,22 @@
     252:252:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
     252:252:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
     253:260:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
-    261:261:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    261:261:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     261:261:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
     262:281:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:559 -> a
-    282:282:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    282:282:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     282:282:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
     283:283:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
     284:284:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     284:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
     285:318:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):560:593 -> a
-    319:319:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):899:899 -> a
+    319:319:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):897:897 -> a
     319:319:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
     320:333:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
     334:350:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
     334: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):610 -> a
     351:356:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
-    357:357:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    357:357:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     357:357:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
     358:368:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
     369:373:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
@@ -22005,7 +22041,7 @@
     401:401:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
     401:401:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
     402:402:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
-    403:403:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    403:403:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     403:403:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
     404:421:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:690 -> a
     1:1:void add(java.lang.Object):28:28 -> add
@@ -22058,13 +22094,13 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.w.b.p:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> A2
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> C2
-    1:2:int maxInOutValueRegisterSize():82:83 -> D2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> E2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> B2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> D2
+    1:2:int maxInOutValueRegisterSize():82:83 -> E2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> F2
     boolean hasInvariantOutType() -> I0
-    boolean isBinop() -> Y0
+    boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
     9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -22082,8 +22118,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> u2
-    1:1:int maxOutValueRegister():95:95 -> v2
+    1:1:int maxInValueRegister():90:90 -> v2
+    1:1:int maxOutValueRegister():95:95 -> w2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.w.b.q:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -22149,13 +22185,12 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> A2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> B2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> B2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> B2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> C2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isCheckCast() -> Z0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
     2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:70 -> a
     16:16:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
@@ -22164,6 +22199,7 @@
     19:20:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):164:165 -> a
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):176:176 -> a
     22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):181:181 -> a
+    boolean isCheckCast() -> a1
     1:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):124:130 -> b
     8:8:com.android.tools.r8.graph.DexType getType():45:45 -> b
     8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):132 -> b
@@ -22171,15 +22207,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.w.b.t:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> B2
+    boolean isCommutative() -> C2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -22194,13 +22230,13 @@
     122:128:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):213:219 -> a
     129:129:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):234:234 -> a
     130:130:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
-    boolean isCmp() -> a1
+    boolean isCmp() -> b1
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.w.b.t$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -22215,7 +22251,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> A2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -22250,13 +22286,13 @@
     48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
     49:49:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
-    boolean isConstClass() -> b1
-    boolean isOutConstant() -> d2
+    boolean isConstClass() -> c1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():72:72 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.w.b.v:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -22268,14 +22304,14 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):54 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isConstInstruction() -> c1
+    boolean isConstInstruction() -> d1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
 com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.w.b.w:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -22293,19 +22329,19 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.w.b.x:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> A2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -22323,32 +22359,32 @@
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> d2
-    boolean isConstMethodType() -> e1
+    boolean isOutConstant() -> e2
+    boolean isConstMethodType() -> f1
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():78:78 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.w.b.y:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> A2
-    1:2:double getDoubleValue():92:93 -> B2
-    1:2:float getFloatValue():87:88 -> C2
-    1:2:int getIntValue():76:77 -> D2
-    3:5:int getIntValue():76:78 -> D2
-    1:2:long getLongValue():82:83 -> E2
-    1:1:long getRawValue():97:97 -> F2
-    1:1:boolean is16Bit():273:273 -> G2
-    1:1:boolean is8Bit():265:265 -> H2
-    1:1:boolean isIntegerOne():109:109 -> I2
-    1:1:boolean isIntegerZero():105:105 -> J2
-    1:1:boolean isZero():101:101 -> K2
-    1:1:boolean negativeIs16Bit():277:277 -> L2
-    1:1:boolean negativeIs8Bit():269:269 -> M2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> B2
+    1:2:double getDoubleValue():92:93 -> C2
+    1:2:float getFloatValue():87:88 -> D2
+    1:2:int getIntValue():76:77 -> E2
+    3:5:int getIntValue():76:78 -> E2
+    1:2:long getLongValue():82:83 -> F2
+    1:1:long getRawValue():97:97 -> G2
+    1:1:boolean is16Bit():273:273 -> H2
+    1:1:boolean is8Bit():265:265 -> I2
+    1:1:boolean isIntegerOne():109:109 -> J2
+    1:1:boolean isIntegerZero():105:105 -> K2
+    1:1:boolean isZero():101:101 -> L2
+    1:1:boolean negativeIs16Bit():277:277 -> M2
+    1:1:boolean negativeIs8Bit():269:269 -> N2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:59 -> a
     5:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):64:64 -> a
@@ -22390,20 +22426,20 @@
     107:107:boolean outTypeKnownToBeBoolean(java.util.Set):325:325 -> a
     1:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):316:319 -> b
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> d2
-    boolean isConstNumber() -> f1
+    boolean isOutConstant() -> e2
+    boolean isConstNumber() -> g1
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:4:java.lang.String toString():245:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():234:234 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.w.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> A2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22424,7 +22460,7 @@
     12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     14:14:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -22432,13 +22468,13 @@
     20:20:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isConstString() -> g1
+    boolean isOutConstant() -> e2
+    boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():74:74 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.w.b.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -22454,6 +22490,7 @@
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.w.b.B:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22463,25 +22500,27 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalRead():96:96 -> 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):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalRead() -> k1
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isDebugLocalRead() -> l1
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.w.b.C:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    boolean isDebugLocalUninitialized() -> l1
+    boolean isDebugLocalUninitialized() -> m1
 com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.w.b.D:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:30 -> <init>
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> a
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
     3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> d2
-    boolean isDebugLocalWrite() -> m1
+    boolean isOutConstant() -> e2
+    boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.w.b.E:
     boolean $assertionsDisabled -> j
@@ -22489,9 +22528,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> A2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> a
@@ -22507,17 +22547,18 @@
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):124:124 -> a
     19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugLocalsChange() -> n1
+    boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
-    1:1:int maxInValueRegister():77:77 -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxOutValueRegister():82:82 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():77:77 -> v2
+    1:1:int maxOutValueRegister():82:82 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.w.b.F:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22527,11 +22568,11 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():104:104 -> 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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isDebugPosition() -> o1
-    1:1:int maxInValueRegister():55:55 -> u2
-    1:1:int maxOutValueRegister():60:60 -> v2
+    boolean isDebugPosition() -> p1
+    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    int opcode() -> w2
+    1:1:int maxOutValueRegister():60:60 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.w.b.G:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -22553,8 +22594,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> A2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> B2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22580,17 +22621,17 @@
     19:19:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> d2
-    boolean isDexItemBasedConstString() -> p1
+    boolean isOutConstant() -> e2
+    boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():97:97 -> v2
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.w.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22609,8 +22650,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isDiv() -> q1
-    int opcode() -> w2
+    boolean isDiv() -> r1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.w.b.K:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
@@ -22670,13 +22711,13 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> A2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> A2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> A2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> B2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> B2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> B2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> D2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22687,10 +22728,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-    boolean isDup() -> r1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():92:92 -> v2
-    int opcode() -> w2
+    boolean isDup() -> s1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():92:92 -> w2
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Dup asDup() -> z
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.w.b.M:
     boolean $assertionsDisabled -> h
@@ -22707,10 +22748,10 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):112 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-    boolean isDup2() -> s1
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    boolean isDup2() -> t1
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.w.b.O:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -22718,9 +22759,9 @@
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> A2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> B2
-    com.android.tools.r8.ir.code.Value value() -> C2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> B2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
+    com.android.tools.r8.ir.code.Value value() -> D2
     boolean hasInvariantOutType() -> I0
     1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:65 -> a
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -22740,7 +22781,7 @@
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
     12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152 -> d
     13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):154:164 -> d
-    boolean isFieldInstruction() -> u1
+    boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.w.b.P:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
@@ -22787,7 +22828,8 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> C2
+    boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
@@ -22796,10 +22838,10 @@
     5:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():65:65 -> v2
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():65:65 -> w2
+    boolean isGoto() -> x1
+    int opcode() -> x2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.w.b.T:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -22815,11 +22857,11 @@
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):119:119 -> <init>
     2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):99:129 -> <init>
-    1:12:boolean verifyNoImpreciseOrBottomTypes():806:817 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():821:828 -> B
+    1:12:boolean verifyNoImpreciseOrBottomTypes():804:815 -> A
+    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
     1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    1:6:boolean computeAllThrowingInstructionsHavePositions():998:1003 -> D
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():832:843 -> E
+    1:6:boolean computeAllThrowingInstructionsHavePositions():996:1001 -> D
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():830:841 -> E
     1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):265:281 -> a
     18:22:void ensureBlockNumbering():386:390 -> a
     18:22:void print(com.android.tools.r8.utils.CfgPrinter):492 -> a
@@ -22827,37 +22869,42 @@
     25:25:void removeBlocks(java.util.Collection):430:430 -> a
     26:26:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):544:544 -> a
     27:27:void lambda$consistentBlockNumbering$1(java.lang.Integer,java.lang.Long):699:699 -> a
-    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):808:814 -> a
-    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):813:813 -> a
-    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):850:853 -> a
-    40:47:boolean verifySSATypeLattice(java.util.function.Predicate):859:866 -> a
-    48:60:java.util.List collectArguments(boolean):929:941 -> a
-    48:60:java.util.List collectArguments():925 -> a
-    61:61:java.util.List collectArguments(boolean):940:940 -> a
-    61:61:java.util.List collectArguments():925 -> a
-    62:62:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):957:957 -> a
-    63:63:void setAllThrowingInstructionsHavePositions(boolean):994:994 -> a
-    64:67:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1023:1026 -> a
-    68:69:boolean anyBlocksMarkedWithColor(int):1066:1067 -> a
-    70:70:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1079 -> a
-    71:79:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1104:1112 -> a
-    71:79:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1080 -> a
-    80:85:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1081:1086 -> a
-    86:86:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    86:86:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1086 -> a
-    87:93:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1087:1093 -> a
-    94:94:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    94:94:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1093 -> a
-    95:95:void markTransitiveSuccessors(java.util.Deque,int):1151:1151 -> a
-    96:96:boolean isMarkingColorInUse(int):1062:1062 -> a
-    96:96:void markTransitiveSuccessors(java.util.Deque,int):1151 -> a
-    97:106:void markTransitiveSuccessors(java.util.Deque,int):1151:1160 -> a
-    107:107:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1172 -> a
-    108:108:boolean isMarkingColorInUse(int):1062:1062 -> a
-    108:108:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172 -> a
-    109:120:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1172:1183 -> a
-    121:121:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1531:1531 -> a
-    121:121:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1091 -> a
+    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):806:812 -> a
+    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$2(com.android.tools.r8.ir.code.Value):811:811 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$7(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):848:851 -> a
+    40:47:boolean verifySSATypeLattice(java.util.function.Predicate):857:864 -> a
+    48:60:java.util.List collectArguments(boolean):927:939 -> a
+    48:60:java.util.List collectArguments():923 -> a
+    61:61:java.util.List collectArguments(boolean):938:938 -> a
+    61:61:java.util.List collectArguments():923 -> a
+    62:62:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):955:955 -> a
+    63:63:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963:963 -> a
+    64:64:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    64:64:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):963 -> a
+    65:65:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):964:964 -> a
+    66:66:void setAllThrowingInstructionsHavePositions(boolean):992:992 -> a
+    67:70:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1021:1024 -> a
+    71:71:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1077:1077 -> a
+    72:80:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1102:1110 -> a
+    72:80:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1078 -> a
+    81:86:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1079:1084 -> a
+    87:87:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    87:87:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1084 -> a
+    88:94:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1085:1091 -> a
+    95:95:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    95:95:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1091 -> a
+    96:96:void markTransitiveSuccessors(java.util.Deque,int):1149:1149 -> a
+    97:97:boolean isMarkingColorInUse(int):1060:1060 -> a
+    97:97:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    98:99:boolean anyBlocksMarkedWithColor(int):1064:1065 -> a
+    98:99:void markTransitiveSuccessors(java.util.Deque,int):1149 -> a
+    100:109:void markTransitiveSuccessors(java.util.Deque,int):1149:1158 -> a
+    110:110:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1170 -> a
+    111:111:boolean isMarkingColorInUse(int):1060:1060 -> a
+    111:111:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170 -> a
+    112:123:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1170:1181 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1566:1566 -> a
+    124:124:java.util.Iterator lambda$getInstructionsReachableFrom$8(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1089 -> a
     1:52:java.util.Map computeLiveAtEntrySets():149:200 -> b
     53:73:java.util.Map computeLiveAtEntrySets():199:219 -> b
     74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
@@ -22867,51 +22914,47 @@
     111:111:java.util.Map computeLiveAtEntrySets():258 -> b
     112:114:java.util.Map computeLiveAtEntrySets():258:260 -> b
     115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):509:519 -> b
-    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:825 -> b
-    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):823:823 -> b
-    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):847:847 -> b
-    131:131:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965:965 -> b
-    132:132:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    132:132:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):965 -> b
-    133:133:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int):966:966 -> b
-    134:134:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1191:1191 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:823 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$3(com.android.tools.r8.ir.code.Value):821:821 -> b
+    130:130:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):845:845 -> b
+    131:131:boolean isMarkingColorInUse(int):1060:1060 -> b
+    132:132:boolean lambda$findFirstNonNonePosition$9(com.android.tools.r8.ir.code.Instruction):1189:1189 -> b
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):540:541 -> c
     3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):549:552 -> c
     3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):541 -> c
     7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):542:544 -> c
-    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:839 -> c
-    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):834:840 -> c
-    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):835:835 -> c
-    24:30:java.util.List computeNormalExitBlocks():885:891 -> c
-    31:31:boolean isMarkingColorInUse(int):1062:1062 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:837 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Value):832:838 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$4(com.android.tools.r8.ir.code.Instruction):833:833 -> c
+    24:30:java.util.List computeNormalExitBlocks():883:889 -> c
+    31:31:java.util.ListIterator listIterator(int):897:897 -> c
     1:4:boolean consistentBlockNumbering():694:697 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):838:838 -> d
-    6:6:java.util.ListIterator listIterator(int):899:899 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():980:980 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():980 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():981:981 -> e
-    4:4:void returnMarkingColor(int):1056:1056 -> e
-    5:5:boolean isMarkingColorInUse(int):1062:1062 -> e
-    5:5:void returnMarkingColor(int):1056 -> e
-    6:6:void returnMarkingColor(int):1056:1056 -> e
-    7:8:void clearMarks(int):407:408 -> e
-    7:8:void returnMarkingColor(int):1057 -> e
-    9:9:void returnMarkingColor(int):1058:1058 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():990:990 -> f
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):836:836 -> d
+    6:6:void returnMarkingColor(int):1054:1054 -> d
+    7:7:boolean isMarkingColorInUse(int):1060:1060 -> d
+    7:7:void returnMarkingColor(int):1054 -> d
+    8:8:void returnMarkingColor(int):1054:1054 -> d
+    9:10:void clearMarks(int):407:408 -> d
+    9:10:void returnMarkingColor(int):1055 -> d
+    11:11:void returnMarkingColor(int):1056:1056 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():978:978 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():978 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():979:979 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():988:988 -> f
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:14:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1191:1204 -> h
-    1:1:int getHighestBlockNumber():970:970 -> i
-    1:1:int getNextInstructionNumber():921:921 -> j
-    1:7:com.android.tools.r8.ir.code.Value getThis():946:952 -> k
-    1:3:java.util.Set getUnreachableBlocks():1117:1119 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> l
-    4:4:java.util.Set getUnreachableBlocks():1119 -> l
-    5:10:java.util.Set getUnreachableBlocks():1120:1125 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():877:877 -> m
-    1:1:java.lang.Iterable instructions():873:873 -> n
+    1:14:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1189:1202 -> h
+    1:1:int getHighestBlockNumber():968:968 -> i
+    1:1:int getNextInstructionNumber():919:919 -> j
+    1:7:com.android.tools.r8.ir.code.Value getThis():944:950 -> k
+    1:3:java.util.Set getUnreachableBlocks():1115:1117 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> l
+    4:4:java.util.Set getUnreachableBlocks():1117 -> l
+    5:10:java.util.Set getUnreachableBlocks():1118:1123 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():875:875 -> m
+    1:1:java.lang.Iterable instructions():871:871 -> n
     1:1:boolean isConsistentGraph():527:527 -> o
-    2:2:boolean noColorsInUse():1075:1075 -> o
+    2:2:boolean noColorsInUse():1073:1073 -> o
     2:2:boolean isConsistentGraph():527 -> o
     3:5:boolean isConsistentGraph():527:529 -> o
     6:21:boolean consistentPredecessorSuccessors():665:680 -> o
@@ -22922,10 +22965,10 @@
     25:25:boolean isConsistentGraph():531:531 -> o
     26:29:boolean consistentBlockInstructions():706:709 -> o
     26:29:boolean isConsistentGraph():531 -> o
-    30:39:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):64:73 -> o
+    30:39:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):65:74 -> o
     30:39:boolean consistentBlockInstructions():707 -> o
     30:39:boolean isConsistentGraph():531 -> o
-    40:44:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):72:76 -> o
+    40:44:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):73:77 -> o
     40:44:boolean consistentBlockInstructions():707 -> o
     40:44:boolean isConsistentGraph():531 -> o
     45:45:boolean isConsistentGraph():532:532 -> o
@@ -22968,28 +23011,28 @@
     49:57:boolean consistentDefUseChains():624 -> p
     49:57:boolean isConsistentSSA():500 -> p
     58:58:boolean isConsistentSSA():501:501 -> p
-    59:76:boolean validThrowingInstructions():780:797 -> p
-    59:76:boolean isConsistentSSA():501 -> p
-    77:77:boolean isConsistentSSA():502:502 -> p
-    78:89:boolean noCriticalEdges():560:571 -> p
-    78:89:boolean isConsistentSSA():502 -> p
-    90:92:boolean isConsistentSSA():502:504 -> p
-    1:1:java.util.ListIterator listIterator():895:895 -> q
+    59:75:boolean validThrowingInstructions():780:796 -> p
+    59:75:boolean isConsistentSSA():501 -> p
+    76:76:boolean isConsistentSSA():502:502 -> p
+    77:88:boolean noCriticalEdges():560:571 -> p
+    77:88:boolean isConsistentSSA():502 -> p
+    89:91:boolean isConsistentSSA():502:504 -> p
+    1:1:java.util.ListIterator listIterator():893:893 -> q
     1:1:com.android.tools.r8.ir.code.IRMetadata metadata():133:133 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():903:905 -> s
-    1:7:int numberRemainingInstructions():911:917 -> t
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():901:903 -> s
+    1:7:int numberRemainingInstructions():909:915 -> t
     1:7:java.lang.String toString():397:403 -> toString
-    1:1:void removeAllTrivialPhis():1011:1011 -> u
-    1:3:java.util.Set removeUnreachableBlocks():1130:1132 -> v
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1147:1147 -> v
-    4:4:java.util.Set removeUnreachableBlocks():1132 -> v
-    5:14:java.util.Set removeUnreachableBlocks():1133:1142 -> v
-    1:1:int reserveMarkingColor():1032:1032 -> w
-    2:2:boolean anyMarkingColorAvailable():1046:1046 -> w
-    2:2:int reserveMarkingColor():1032 -> w
-    3:11:int reserveMarkingColor():1032:1040 -> w
+    1:1:void removeAllTrivialPhis():1009:1009 -> u
+    1:3:java.util.Set removeUnreachableBlocks():1128:1130 -> v
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1145:1145 -> v
+    4:4:java.util.Set removeUnreachableBlocks():1130 -> v
+    5:14:java.util.Set removeUnreachableBlocks():1131:1140 -> v
+    1:1:int reserveMarkingColor():1030:1030 -> w
+    2:2:boolean anyMarkingColorAvailable():1044:1044 -> w
+    2:2:int reserveMarkingColor():1030 -> w
+    3:11:int reserveMarkingColor():1030:1038 -> w
     12:13:boolean verifyNoBlocksMarked(int):423:424 -> w
-    12:13:int reserveMarkingColor():1040 -> w
+    12:13:int reserveMarkingColor():1038 -> w
     1:24:void splitCriticalEdges():290:313 -> x
     25:34:void splitCriticalEdges():312:321 -> x
     1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():448:471 -> y
@@ -22999,7 +23042,7 @@
     26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():443 -> y
     1:20:void traceBlocks():352:371 -> z
     21:33:void traceBlocks():370:382 -> z
-    34:34:boolean noColorsInUse():1075:1075 -> z
+    34:34:boolean noColorsInUse():1073:1073 -> z
     34:34:void traceBlocks():382 -> z
     35:35:void traceBlocks():382:382 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.w.b.T$a:
@@ -23141,18 +23184,18 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> A2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> B2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> C2
-    1:2:void invert():110:111 -> D2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> D2
-    3:4:void invert():112 -> D2
-    5:5:void invert():113:113 -> D2
-    1:1:boolean isZeroTest():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> F2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> G2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> H2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> C2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> D2
+    1:2:void invert():110:111 -> E2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> E2
+    3:4:void invert():112 -> E2
+    5:5:void invert():113:113 -> E2
+    1:1:boolean isZeroTest():93:93 -> F2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> G2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> H2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> I2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -23172,10 +23215,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> u2
-    1:1:int maxOutValueRegister():179:179 -> v2
-    int opcode() -> w2
-    boolean isIf() -> x1
+    1:1:int maxInValueRegister():174:174 -> v2
+    1:1:int maxOutValueRegister():179:179 -> w2
+    int opcode() -> x2
+    boolean isIf() -> y1
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.w.b.X$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -23210,18 +23253,19 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.w.b.a0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> D2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -23250,16 +23294,16 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceGet() -> y1
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
+    boolean isInstanceGet() -> z1
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.w.b.b0:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):24:25 -> <init>
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> A2
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> B2
+    boolean isInstanceOf() -> A1
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> C2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -23274,18 +23318,18 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
-    boolean isInstanceOf() -> z1
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.w.b.c0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean isInstancePut() -> A1
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> C2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> D2
+    boolean isInstancePut() -> B1
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
@@ -23310,10 +23354,9 @@
     1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():170:170 -> v2
-    int opcode() -> w2
-    boolean throwsOnNullInput() -> z2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():170:170 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.w.b.d0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -23330,85 +23373,86 @@
     26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):45:67 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():591:591 -> A0
-    boolean isInstancePut() -> A1
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
+    boolean isInstanceOf() -> A1
+    boolean throwsOnNullInput() -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1353:1353 -> B0
-    boolean isIntSwitch() -> B1
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    boolean isInstancePut() -> B1
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
-    boolean isIntroducingAnAlias() -> C1
+    boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
-    boolean isInvoke() -> D1
+    boolean isIntroducingAnAlias() -> D1
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     1:2:com.android.tools.r8.ir.code.Position getPosition():79:80 -> E0
-    boolean isInvokeCustom() -> E1
+    boolean isInvoke() -> E1
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
     1:1:java.lang.String getPositionAsString():89:89 -> F0
-    boolean isInvokeDirect() -> F1
+    boolean isInvokeCustom() -> F1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
     1:1:boolean hasBlock():289:289 -> G0
-    boolean isInvokeInterface() -> G1
+    boolean isInvokeDirect() -> G1
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     1:1:java.util.List inValues():93:93 -> H0
     1:1:boolean hasInValueWithLocalInfo():107 -> H0
     2:3:boolean hasInValueWithLocalInfo():107:108 -> H0
-    boolean isInvokeMethod() -> H1
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMethodWithReceiver() -> I1
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokePolymorphic() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:boolean instructionInstanceCanThrow():520:520 -> M0
-    boolean isInvokeStatic() -> M1
+    1:1:boolean instructionInstanceCanThrow():524:524 -> M0
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokeSuper() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeVirtual() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    boolean isAnd() -> P0
-    boolean isJumpInstruction() -> P1
+    boolean isAllowedAfterThrowingInstruction() -> P0
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    boolean isArgument() -> Q0
-    boolean isLoad() -> Q1
+    boolean isAnd() -> Q0
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    boolean isArithmeticBinop() -> R0
-    boolean isLogicalBinop() -> R1
+    boolean isArgument() -> R0
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    boolean isArrayGet() -> S0
-    boolean isMonitor() -> S1
+    boolean isArithmeticBinop() -> S0
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
-    boolean isArrayLength() -> T0
-    boolean isMove() -> T1
+    boolean isArrayGet() -> T0
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
-    boolean isArrayPut() -> U0
-    boolean isMoveException() -> U1
+    boolean isArrayLength() -> U0
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
-    boolean isAssume() -> V0
-    boolean isMul() -> V1
+    boolean isArrayPut() -> V0
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
-    boolean isAssumeDynamicType() -> W0
-    boolean isNeg() -> W1
+    boolean isAssume() -> W0
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
-    boolean isAssumeNonNull() -> X0
-    boolean isNewArrayEmpty() -> X1
+    boolean isAssumeDynamicType() -> X0
+    boolean isNeg() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
-    boolean isBinop() -> Y0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isAssumeNonNull() -> Y0
+    boolean isNewArrayEmpty() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
-    boolean isCheckCast() -> Z0
-    boolean isNewInstance() -> Z1
+    boolean isBinop() -> Z0
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -23460,130 +23504,130 @@
     171:171:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
     171:171:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     172:178:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
-    179:179:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    180:180:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):542:542 -> a
-    181:182:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1289:1290 -> a
-    183:186:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1296:1299 -> a
-    187:189:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1304:1306 -> a
-    190:196:boolean verifyValidPositionInfo(boolean):1373:1379 -> a
-    197:197:boolean verifyValidPositionInfo(boolean):1375:1375 -> a
+    179:179:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    180:180:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
+    181:182:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1297:1298 -> a
+    183:186:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1304:1307 -> a
+    187:189:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1312:1314 -> a
+    190:196:boolean verifyValidPositionInfo(boolean):1381:1387 -> a
+    197:197:boolean verifyValidPositionInfo(boolean):1383:1383 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    boolean isCmp() -> a1
-    boolean isNot() -> a2
+    boolean isCheckCast() -> a1
+    boolean isNewInstance() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     9:15:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):202:208 -> b
     16:16:void printLIR(com.android.tools.r8.utils.CfgPrinter):338:338 -> b
-    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):524:524 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1311:1322 -> b
+    17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):528:528 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
-    boolean isConstClass() -> b1
-    boolean isNumberConversion() -> b2
+    boolean isCmp() -> b1
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    boolean isConstInstruction() -> c1
-    boolean isOr() -> c2
+    boolean isConstClass() -> c1
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
-    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):550:554 -> d
+    10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    boolean isConstMethodHandle() -> d1
-    boolean isOutConstant() -> d2
+    boolean isConstInstruction() -> d1
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    boolean isConstMethodType() -> e1
-    boolean isPop() -> e2
+    boolean isConstMethodHandle() -> e1
+    boolean isOutConstant() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    boolean isConstNumber() -> f1
-    boolean isRem() -> f2
+    boolean isConstMethodType() -> f1
+    boolean isPop() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    boolean isConstString() -> g1
-    boolean isReturn() -> g2
+    boolean isConstNumber() -> g1
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    1:4:boolean isCreatingArray():1268:1271 -> h1
-    boolean isShl() -> h2
+    boolean isConstString() -> h1
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:1:boolean isCreatingInstanceOrArray():1275:1275 -> i1
-    boolean isShr() -> i2
+    1:4:boolean isCreatingArray():1276:1279 -> i1
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:5:boolean isDebugInstruction():1076:1080 -> j1
-    boolean isStaticGet() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    boolean isDebugLocalRead() -> k1
-    boolean isStaticPut() -> k2
+    1:5:boolean isDebugInstruction():1080:1084 -> k1
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isDebugLocalUninitialized() -> l1
-    boolean isStore() -> l2
+    boolean isDebugLocalRead() -> l1
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isDebugLocalWrite() -> m1
-    boolean isStringSwitch() -> m2
+    boolean isDebugLocalUninitialized() -> m1
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isDebugLocalsChange() -> n1
-    boolean isSub() -> n2
+    boolean isDebugLocalWrite() -> n1
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isDebugPosition() -> o1
-    boolean isSwap() -> o2
+    boolean isDebugLocalsChange() -> o1
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    boolean isDexItemBasedConstString() -> p1
-    boolean isSwitch() -> p2
+    boolean isDebugPosition() -> p1
+    boolean isSwap() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isDiv() -> q1
-    boolean isThrow() -> q2
+    boolean isDexItemBasedConstString() -> q1
+    boolean isSwitch() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isDup() -> r1
-    boolean isUnop() -> r2
+    boolean isDiv() -> r1
+    boolean isThrow() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isDup2() -> s1
-    boolean isUshr() -> s2
+    boolean isDup() -> s1
+    boolean isUnop() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    1:1:boolean isFieldGet():852:852 -> t1
-    boolean isXor() -> t2
+    boolean isDup2() -> t1
+    boolean isUshr() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
-    boolean isFieldInstruction() -> u1
-    int maxInValueRegister() -> u2
+    1:1:boolean isFieldGet():856:856 -> u1
+    boolean isXor() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
-    1:1:boolean isFieldPut():856:856 -> v1
-    int maxOutValueRegister() -> v2
+    boolean isFieldInstruction() -> v1
+    int maxInValueRegister() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1263:1263 -> w0
-    boolean isGoto() -> w1
-    int opcode() -> w2
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:boolean isFieldPut():860:860 -> w1
+    int maxOutValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
-    boolean isIf() -> x1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> x2
+    boolean isGoto() -> x1
+    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    1:1:java.util.Set getDebugValues():595:595 -> y0
-    boolean isInstanceGet() -> y1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> y2
+    1:1:java.util.Set getDebugValues():599:599 -> y0
+    boolean isIf() -> y1
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
-    boolean isInstanceOf() -> z1
-    boolean throwsOnNullInput() -> z2
+    boolean isInstanceGet() -> z1
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.w.b.e0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> b
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
@@ -23610,15 +23654,15 @@
     int[] keys -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
-    boolean isIntSwitch() -> B1
-    1:7:boolean valid():55:61 -> E2
+    boolean isIntSwitch() -> C1
+    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:1:int getFirstKey():177:177 -> G2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> H2
-    3:3:int getKey(int):206:206 -> H2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> H2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> H2
-    1:1:int[] getKeys():210:210 -> I2
+    1:1:int getFirstKey():177:177 -> H2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> I2
+    3:3:int getKey(int):206:206 -> I2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> I2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> I2
+    1:1:int[] getKeys():210:210 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -23668,33 +23712,33 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.w.b.i0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> A2
-    com.android.tools.r8.graph.DexType getReturnType() -> B2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> C2
-    boolean isInvoke() -> D1
-    java.lang.String getTypeString() -> D2
-    1:1:int requiredArgumentRegisters():108:108 -> E2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> E2
-    2:2:int requiredArgumentRegisters():109 -> E2
-    1:1:java.util.List arguments():103:103 -> F2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> F2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> F2
-    3:3:java.util.List arguments():103:103 -> F2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> F2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> F2
-    6:6:java.util.List arguments():103:103 -> F2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> F2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> F2
-    8:8:java.util.List arguments():103:103 -> F2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> F2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> F2
+    1:1:java.util.List arguments():103:103 -> B2
+    com.android.tools.r8.graph.DexType getReturnType() -> C2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    boolean isInvoke() -> E1
+    java.lang.String getTypeString() -> E2
+    1:1:int requiredArgumentRegisters():108:108 -> F2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> F2
+    2:2:int requiredArgumentRegisters():109 -> F2
+    1:1:java.util.List arguments():103:103 -> G2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> G2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> G2
+    3:3:java.util.List arguments():103:103 -> G2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> G2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> G2
+    6:6:java.util.List arguments():103:103 -> G2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> G2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> G2
+    8:8:java.util.List arguments():103:103 -> G2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> G2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
@@ -23753,10 +23797,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> u2
-    1:1:int maxInValueRegister():213 -> u2
-    2:4:int maxInValueRegister():213:215 -> u2
-    int maxOutValueRegister() -> v2
+    1:1:java.util.List arguments():103:103 -> v2
+    1:1:int maxInValueRegister():213 -> v2
+    2:4:int maxInValueRegister():213:215 -> v2
+    int maxOutValueRegister() -> w2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.w.b.i0$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -23784,11 +23828,11 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):30:32 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeCustom() -> E1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> F2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeCustom() -> F1
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -23825,16 +23869,16 @@
     84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():120:120 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.w.b.k0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():35:35 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeDirect() -> F1
-    1:1:boolean isInterface():57:57 -> H2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeDirect() -> G1
+    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
@@ -23855,85 +23899,85 @@
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):136 -> e
     10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:143 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.w.b.l0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:28 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeInterface() -> G1
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):117:117 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):122:122 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):132:132 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:99 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:111 -> f
-    int opcode() -> w2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.w.b.m0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):27:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():33:33 -> B2
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> F2
-    boolean isInvokeMethod() -> H1
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():34:34 -> C2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():38:38 -> G2
     boolean hasInvariantOutType() -> I0
+    boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    2:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):75:80 -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):43:43 -> a
+    2:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):78:83 -> a
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):85:85 -> a
+    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
     10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86 -> a
-    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):86:87 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
     13:13:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):87:87 -> a
+    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
     15:15:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79 -> a
-    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):98:106 -> a
-    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):117:117 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):82 -> a
+    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:109 -> a
+    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():47:47 -> toString
+    1:1:java.lang.String toString():48:48 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.w.b.n0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():60:60 -> B0
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():36:37 -> G2
-    boolean isInvokeMethodWithReceiver() -> I1
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):24:24 -> <init>
+    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():65:65 -> B0
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():38:39 -> H2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):45:45 -> a
-    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):65:79 -> b
-    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):78:78 -> b
-    boolean throwsOnNullInput() -> z2
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):49:49 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):55:55 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):70:84 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):83:83 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.w.b.o0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> F2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> G2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> G2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> G2
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> H2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> H2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeMultiNewArray() -> J1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
@@ -23946,7 +23990,7 @@
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
     11:14:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:120 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     15:15:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120 -> a
     16:30:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:134 -> a
     31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -23957,20 +24001,20 @@
     48:48:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.w.b.p0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> B2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> F2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> C2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> G2
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> H2
     boolean hasInvariantOutType() -> I0
-    boolean isInvokeNewArray() -> K1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -23980,7 +24024,7 @@
     24:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
     25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
     26:29:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:147 -> a
-    30:30:boolean com.android.tools.r8.graph.DexType.isWideType():248:248 -> a
+    30:30:boolean com.android.tools.r8.graph.DexType.isWideType():251:251 -> a
     30:30:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> a
     31:45:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:161 -> a
     46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -23992,74 +24036,74 @@
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.w.b.q0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46:46 -> B2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():51:51 -> C2
-    java.lang.String getTypeString() -> D2
-    1:1:com.android.tools.r8.graph.DexProto getProto():60:60 -> G2
-    boolean isInvokePolymorphic() -> L1
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):32:33 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():48:48 -> C2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> D2
+    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexProto getProto():62:62 -> H2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:72 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:78 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:86 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):91:97 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():60:60 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):97:98 -> a
-    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):103:105 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134:134 -> a
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:74 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:80 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:88 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:99 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():62:62 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:100 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:107 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):136:136 -> a
     39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):180:180 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134 -> a
-    40:40:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):142:142 -> a
-    41:41:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
-    41:41:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):136 -> a
+    40:42:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:150 -> a
+    43:43:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):204:204 -> a
+    43:43:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.w.b.r0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeStatic() -> M1
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():58:58 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:86 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137:137 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):145:145 -> a
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
-    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):207:207 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218:218 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):166:203 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:113 -> e
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:87 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138:138 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:148 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):158:158 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):168:168 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):215:215 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):226:226 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):174:211 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:114 -> e
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114 -> e
-    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):115:121 -> e
-    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:131 -> f
-    int opcode() -> w2
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):115 -> e
+    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):116:122 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:132 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.w.b.s0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):30:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeSuper() -> N1
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
     20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
@@ -24070,37 +24114,37 @@
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
     1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.w.b.t0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):31:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> C2
-    java.lang.String getTypeString() -> D2
-    boolean isInvokeVirtual() -> O1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> D2
+    java.lang.String getTypeString() -> E2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):120:120 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):125:125 -> a
-    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):135:135 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):192:192 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> a
+    23:23:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-    1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:181 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:102 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):98:98 -> e
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):110:114 -> f
-    int opcode() -> w2
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> x2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.w.b.u0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> A2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> P1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -24142,9 +24186,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.w.b.w0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> Q1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24156,15 +24200,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():61:61 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():61:61 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.w.b.x0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> F2
-    boolean isLogicalBinop() -> R1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -24204,33 +24248,19 @@
     52:53:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):40:41 -> a
     54:55:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):35:36 -> a
     56:56:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):30:30 -> a
-    57:57:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103:103 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):98:98 -> a
-    58:58:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):96:96 -> a
-    59:59:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):84:84 -> a
-    60:60:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):79:92 -> a
-    61:74:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):88:94 -> a
-    75:81:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):86:86 -> a
-    82:82:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):82:82 -> a
-    83:83:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
 com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.w.b.z0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
-    1:1:boolean isEnter():50:50 -> A2
+    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> B2
+    1:1:boolean isEnter():50:50 -> B2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> S1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -24241,11 +24271,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):109 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
     1:7:java.lang.String getInstructionName():114:120 -> z0
-    boolean throwsOnNullInput() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.w.b.z0$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -24257,11 +24286,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> A2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> B2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> T1
+    boolean isMove() -> U1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -24273,20 +24302,20 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> d2
+    1:1:boolean isOutConstant():81:81 -> e2
     1:1:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.w.b.B0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> A2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> U1
+    boolean isMoveException() -> V1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -24304,14 +24333,14 @@
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():51:51 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.w.b.C0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> F2
-    boolean isMul() -> V1
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
+    boolean isMul() -> W1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24329,13 +24358,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.w.b.D0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> W1
+    boolean isNeg() -> X1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -24348,17 +24377,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.w.b.E0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> A2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> X1
+    boolean isNewArrayEmpty() -> Y1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -24376,9 +24405,9 @@
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.w.b.F0:
     long size -> i
     short[] data -> j
@@ -24386,10 +24415,10 @@
     int element_width -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):30:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> B2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayFilledData() -> Y1
+    boolean isNewArrayFilledData() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
@@ -24402,9 +24431,9 @@
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():83:83 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():83:83 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.w.b.G0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -24412,12 +24441,11 @@
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> A2
-    1:1:boolean isSpillingAllowed():184:184 -> B2
-    1:1:void markNoSpilling():180:180 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> B2
+    1:1:boolean isSpillingAllowed():184:184 -> C2
+    1:1:void markNoSpilling():180:180 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewInstance() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
@@ -24431,6 +24459,7 @@
     11:11:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):131:131 -> a
     12:12:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
     13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
+    boolean isNewInstance() -> a2
     1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:146 -> b
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
     11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146 -> b
@@ -24445,9 +24474,9 @@
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():68:68 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.w.b.H0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.w.b.I0:
@@ -24465,9 +24494,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> a2
+    boolean isNot() -> b2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.w.b.J0:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -24496,9 +24525,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> b2
+    boolean isNumberConversion() -> c2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.w.b.K0:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -24527,8 +24556,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.w.b.L0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24539,10 +24568,10 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
-    boolean isOr() -> c2
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
+    boolean isOr() -> d2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.w.b.M0:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -24611,10 +24640,10 @@
     7:7:void setIsStackPhi(boolean):350:350 -> b
     8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
     1:1:void clearDefinitionsUsers():335:335 -> b0
-    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:391 -> c
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:391 -> d
     1:1:java.util.List getOperands():171:171 -> d0
     1:1:boolean isTrivialPhi():212:212 -> e0
     1:10:java.lang.String printPhi():302:311 -> f0
@@ -24644,10 +24673,10 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> e2
-    1:1:int maxInValueRegister():59:59 -> u2
-    1:1:int maxOutValueRegister():64:64 -> v2
-    int opcode() -> w2
+    boolean isPop() -> f2
+    1:1:int maxInValueRegister():59:59 -> v2
+    1:1:int maxOutValueRegister():64:64 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.w.b.O0:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
@@ -24676,8 +24705,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.w.b.P0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24696,17 +24725,17 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    boolean isRem() -> f2
+    boolean isRem() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.w.b.Q0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> B2
-    1:1:boolean isReturnVoid():42:42 -> C2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> D2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
+    1:1:boolean isReturnVoid():42:42 -> D2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -24718,15 +24747,15 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> 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):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
-    boolean isReturn() -> g2
+    boolean isReturn() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():97:97 -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():97:97 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.w.b.R0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24738,13 +24767,13 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShl() -> h2
+    boolean isShl() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.w.b.S0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24756,9 +24785,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
-    boolean isShr() -> i2
+    boolean isShr() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.w.b.T0:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.w.b.U0:
@@ -24790,8 +24819,8 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> C2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -24820,52 +24849,56 @@
     109:109:boolean lambda$instructionMayTriggerMethodInvocation$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):220:220 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
-    boolean isStaticGet() -> j2
+    boolean isStaticGet() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.w.b.X0:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> C2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> D2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):138:139 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):157:167 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):161 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:181 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):187:187 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):207:207 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:214 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:212 -> 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):224:224 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):237:237 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:123 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):230:234 -> c
-    boolean isStaticPut() -> k2
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:52:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:163 -> b
+    30:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    53:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
+    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    1:1:java.lang.String toString():192:192 -> toString
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():151:151 -> v2
-    int opcode() -> w2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():190:190 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.w.b.Y0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> A2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -24879,17 +24912,17 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):68 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
-    boolean isStore() -> l2
+    boolean isStore() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> u2
-    int maxOutValueRegister() -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():57:57 -> v2
+    int maxOutValueRegister() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.w.b.Z0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> E2
+    1:4:boolean valid():44:47 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -24899,22 +24932,22 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-    boolean isStringSwitch() -> m2
+    boolean isStringSwitch() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> u2
-    1:1:int maxOutValueRegister():106:106 -> v2
-    int opcode() -> w2
+    1:1:int maxInValueRegister():101:101 -> v2
+    1:1:int maxOutValueRegister():106:106 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.w.b.a1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> B2
-    1:8:int maxInOutValueRegisterSize():131:138 -> D2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> F2
+    boolean isCommutative() -> C2
+    1:8:int maxInOutValueRegisterSize():131:138 -> E2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -24938,9 +24971,9 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
-    boolean isSub() -> n2
+    boolean isSub() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.w.b.b1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24956,27 +24989,27 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):93 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> o2
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():87:87 -> v2
-    int opcode() -> w2
+    boolean isSwap() -> p2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():87:87 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.w.b.c1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> A2
-    1:1:int getFallthroughBlockIndex():55:55 -> B2
-    1:1:int numberOfKeys():68:68 -> C2
-    1:1:int[] targetBlockIndices():40:40 -> D2
-    1:2:boolean valid():25:26 -> E2
-    3:3:int getTargetBlockIndex(int):36:36 -> E2
-    3:3:boolean valid():26 -> E2
-    4:4:int getFallthroughBlockIndex():55:55 -> E2
-    4:4:boolean valid():26 -> E2
-    5:5:boolean valid():26:26 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> F2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> B2
+    1:1:int getFallthroughBlockIndex():55:55 -> C2
+    1:1:int numberOfKeys():68:68 -> D2
+    1:1:int[] targetBlockIndices():40:40 -> E2
+    1:2:boolean valid():25:26 -> F2
+    3:3:int getTargetBlockIndex(int):36:36 -> F2
+    3:3:boolean valid():26 -> F2
+    4:4:int getFallthroughBlockIndex():55:55 -> F2
+    4:4:boolean valid():26 -> F2
+    5:5:boolean valid():26:26 -> F2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> G2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -24984,13 +25017,13 @@
     2:2:int[] targetBlockIndices():40:40 -> d
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
-    boolean isSwitch() -> p2
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
+    boolean isSwitch() -> q2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.w.b.d1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> B2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -25003,27 +25036,27 @@
     11:15:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104:108 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():268:268 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
-    boolean isThrow() -> q2
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    int maxInValueRegister() -> u2
-    1:1:int maxOutValueRegister():49:49 -> v2
-    int opcode() -> w2
+    boolean isThrow() -> r2
+    int maxInValueRegister() -> v2
+    1:1:int maxOutValueRegister():49:49 -> w2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.w.b.e1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> A2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> r2
-    int maxInValueRegister() -> u2
-    int maxOutValueRegister() -> v2
+    boolean isUnop() -> s2
+    int maxInValueRegister() -> v2
+    int maxOutValueRegister() -> w2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.w.b.f1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25036,8 +25069,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> s2
-    int opcode() -> w2
+    boolean isUshr() -> t2
+    int opcode() -> x2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.w.b.g1:
     int needsRegister -> j
     boolean isThis -> k
@@ -25152,36 +25185,38 @@
     439:447:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1181 -> a
     448:448:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
     448:448:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1182 -> a
-    449:455:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1191:1197 -> a
+    449:455:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1212:1218 -> a
     456:456:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    456:456:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1198 -> a
-    457:466:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1199:1208 -> a
+    456:456:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1219 -> a
+    457:466:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1220:1229 -> a
     1:2:boolean usedInMonitorOperation():521:522 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
     1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):282:283 -> b
     3:6:void linkTo(com.android.tools.r8.ir.code.Value):367:370 -> b
     7:8:java.util.Set aliasedUsers():429:430 -> b
-    9:13:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> b
-    14:14:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> b
-    14:14:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> b
-    15:19:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> b
-    20:21:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
-    22:23:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
-    24:24:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
-    25:31:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
-    32:32:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
-    32:32:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):560:561 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):570:571 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1086:1086 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1160:1166 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167 -> b
+    22:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1193:1205 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):510:514 -> c
-    6:7:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
-    8:9:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
-    10:22:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
+    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497 -> c
+    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):500:504 -> c
+    12:16:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):510:514 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):530:531 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):565:566 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):620:632 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
     1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    6:6:boolean lambda$getDynamicLowerBoundType$3(com.android.tools.r8.ir.code.Value):1206:1206 -> d
-    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1227:1227 -> d
     1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):535:536 -> e
     3:8:void clearUsers():545:550 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1194:1194 -> e
+    boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
     1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
     3:8:void clearUsersInfo():595:600 -> f
     1:2:void computeNeedsRegister():726:727 -> g
@@ -25310,8 +25345,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.w.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> B2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> F2
+    boolean isCommutative() -> C2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25324,8 +25359,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    boolean isXor() -> t2
-    int opcode() -> w2
+    boolean isXor() -> u2
+    int opcode() -> x2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.w.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -25545,7 +25580,7 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):133:135 -> a
     24:36:void rewriteNots():222:234 -> a
     24:36:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     37:37:void rewriteNots():234 -> a
     37:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     38:46:void rewriteNots():235:243 -> a
@@ -25702,7 +25737,7 @@
     1:1:int instructionCount():260:260 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):288:292 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     13:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -26023,7 +26058,7 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> 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
@@ -26585,7 +26620,7 @@
     202:202:void insertDebugPositions():676 -> a
     202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     203:204:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
-    205:205:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    205:205:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     205:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     206:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     209:209:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -26596,14 +26631,14 @@
     217:218:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
     219:249:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     219:249:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    250:250:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    250:250:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     250:250:void joinPredecessorsWithIdenticalPhis():2559 -> a
     250:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     251:251:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     252:266:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     252:266:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    267:278:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):498:509 -> a
+    267:278:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):499:510 -> a
     267:278:void joinPredecessorsWithIdenticalPhis():2576 -> a
     267:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     279:279:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
@@ -26616,10 +26651,10 @@
     282:326:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     282:326:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     327:334:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    335:335:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1015:1015 -> a
+    335:335:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1013:1013 -> a
     335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     336:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
-    345:345:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    345:345:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     347:360:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
@@ -26718,7 +26753,7 @@
     553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
     555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
-    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -26727,7 +26762,7 @@
     560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
     563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
     563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
-    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -26994,7 +27029,7 @@
     49:54:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
     55:58:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
     59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
+    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
     60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
     61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
     68:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1670 -> b
@@ -27343,466 +27378,476 @@
     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.w.c.N:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List neverMergePrefixes -> O
-    boolean seenNotNeverMergePrefix -> P
+    java.util.List onWaveDoneActions -> O
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
     com.android.tools.r8.utils.CfgPrinter printer -> t
-    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> G
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> H
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> K
-    boolean $assertionsDisabled -> R
+    boolean seenNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
     com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> g
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> j
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> o
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> u
+    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> J
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> i
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> r
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> s
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> K
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> F
     com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> l
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> C
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> E
-    com.android.tools.r8.graph.DexString highestSortingString -> M
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
+    java.util.List neverMergePrefixes -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> L
+    com.android.tools.r8.ir.optimize.AliasIntroducer aliasIntroducer -> H
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> I
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> L
     com.android.tools.r8.ir.optimize.Outliner outliner -> c
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> G
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> f
-    boolean seenNeverMergePrefix -> Q
+    boolean seenNotNeverMergePrefix -> Q
+    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
-    com.android.tools.r8.ir.optimize.NonNullTracker nonNullTracker -> I
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> p
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> A
     com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> n
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> J
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> e
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> x
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
-    java.util.List onWaveDoneActions -> N
+    com.android.tools.r8.graph.DexString highestSortingString -> N
     1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):190:190 -> <init>
-    2:163: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):173:334 -> <init>
-    164:164:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):347:347 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    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):191:191 -> <init>
+    2:169: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):174:341 -> <init>
+    170:170:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):354:354 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$21(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):682:682 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):678:678 -> a
-    4:4:java.lang.String lambda$new$0(java.lang.String):210:210 -> a
-    5:8:java.util.Set getDesugaredCallSites():338:341 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):442:449 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):382:383 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):451 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):452 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453:453 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):435:436 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
-    31:34:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458:461 -> a
-    35:41:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):465:471 -> a
-    42:43:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):496:497 -> a
-    42:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    44:51:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    44:51:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498 -> a
-    44:51:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    52:52:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):498:498 -> a
-    52:52:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472 -> a
-    53:57:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):534:538 -> a
-    58:60:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):553:555 -> a
-    61:69:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):619:627 -> a
-    70:71:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):847:848 -> a
-    70:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628 -> a
-    72:73:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):403:404 -> a
-    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):629 -> a
-    74:82:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):638:646 -> a
-    83:83:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
-    83:83:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    83:83:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    84:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    84:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646 -> a
-    86:137:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):647:698 -> a
-    138:138:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    138:138:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):698 -> a
-    139:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):699:699 -> a
-    140:141:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):397:398 -> a
-    140:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):700 -> a
-    142:145:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):704:707 -> a
-    146:148:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:391 -> a
-    146:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    149:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):710:711 -> a
-    151:152:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):413:414 -> a
-    151:152:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
-    153:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:713 -> a
-    154:155:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):422:423 -> a
-    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
-    156:157:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
-    156:157:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):715 -> a
-    158:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:718 -> a
-    161:162: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):858:859 -> a
-    161:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
-    163:173:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:731 -> a
-    174:177:com.android.tools.r8.graph.DexType computeOutlineClassType():901:904 -> a
-    174:177:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    178:178:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    178:178:com.android.tools.r8.graph.DexType computeOutlineClassType():904 -> a
-    178:178:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    179:179:com.android.tools.r8.graph.DexType computeOutlineClassType():906:906 -> a
-    179:179:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    180:232:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731:783 -> a
-    233:240:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):777:784 -> a
-    241:241:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):657:657 -> a
-    242:242:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):653:653 -> a
-    243:244:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):728:729 -> a
-    245:245:void addWaveDoneAction(com.android.tools.r8.utils.Action):798:798 -> a
-    246:246:boolean isInWave():808:808 -> a
-    246:246:void addWaveDoneAction(com.android.tools.r8.utils.Action):801 -> a
-    247:247:void addWaveDoneAction(com.android.tools.r8.utils.Action):804:804 -> a
-    248:248:void addWaveDoneAction(com.android.tools.r8.utils.Action):802:802 -> a
-    249:249:void addWaveDoneAction(com.android.tools.r8.utils.Action):799:799 -> a
-    250:250:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):812:812 -> a
-    251:256:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):822:827 -> a
-    257:274:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):826:843 -> a
-    275:285:java.lang.Object lambda$forEachSelectedOutliningMethod$12(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):829:839 -> a
-    286:286:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):869:869 -> a
-    287:296:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):882:891 -> a
-    297:297:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    297:297:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):891 -> a
-    298:298:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):891:891 -> a
-    299:299:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):890:890 -> a
-    300:303:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):913:916 -> a
-    304:309:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):922:927 -> a
-    310:315:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):931:936 -> a
-    316:316:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    316:316:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937 -> a
-    317:317:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):937:937 -> a
-    318:318:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):933:933 -> a
-    319:321:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):954:956 -> a
-    322:322:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):955:955 -> a
-    323:323:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    324:324:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    324:324:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962 -> a
-    325:325:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):962:962 -> a
-    326:326:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):958:958 -> a
-    327:333:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):979:985 -> a
-    334:336:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1027:1029 -> a
-    337:342:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1028:1033 -> a
-    343:343:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    343:343:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033 -> a
-    344:344:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1033:1033 -> a
-    345:358:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1032:1045 -> a
-    359:364:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1839:1844 -> a
-    359:364:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1048 -> a
-    365:371:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1049:1055 -> a
-    372:372:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
-    372:372:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1055 -> a
-    373:387:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1056:1070 -> a
-    388:388:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    388:388:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070 -> a
-    389:403:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1071:1085 -> a
-    404:404:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1592 -> a
-    404:404:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    405:405:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    405:405:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592 -> a
-    405:405:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    406:408:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1592:1594 -> a
-    406:408:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    409:409:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    409:409:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1594 -> a
-    409:409:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    410:413:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1595:1598 -> a
-    410:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1086 -> a
-    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1094:1108 -> a
-    429:429:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1109 -> a
-    430:533:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110:1213 -> a
-    534:536:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):990:992 -> a
-    534:536:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1214 -> a
-    537:545:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1217:1225 -> a
-    546:564:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1224:1242 -> a
-    565:565:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    565:565:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1242 -> a
-    566:589:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1243:1266 -> a
-    590:676:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1258:1344 -> a
-    677:677:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    677:677:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1344 -> a
-    678:688:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1345:1355 -> a
-    689:694:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):890:895 -> a
-    689:694:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1355 -> a
-    695:718:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1356:1379 -> a
-    719:723:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
-    719:723:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    724:730:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
-    724:730:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    724:730:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    731:734:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
-    731:734:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    735:739:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1380:1384 -> a
-    740:762:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1455:1477 -> a
-    740:762:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387 -> a
-    763:763:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1388:1388 -> a
-    764:770:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1484:1490 -> a
-    764:770:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    771:771:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1390 -> a
-    772:778:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1547:1553 -> a
-    772:778:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1391 -> a
-    779:802:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1426:1449 -> a
-    779:802:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1392 -> a
-    803:803:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
-    803:803:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1379 -> a
-    804:806:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1397:1399 -> a
-    807:807:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
-    807:807:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1399 -> a
-    808:824:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400:1416 -> a
-    825:830:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1415:1420 -> a
-    831:831:void lambda$rewriteCodeInternal$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1142:1142 -> a
-    832:832:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1268:1268 -> a
-    833:848:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1498:1513 -> a
-    849:862:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:54 -> a
-    849:862:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    863:863:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):535:535 -> a
-    863:863:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
-    863:863:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    864:872:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
-    864:872:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    873:899:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:82 -> a
-    873:899:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    900:955:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
-    900:955:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1514 -> a
-    956:956:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    956:956:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    957:958:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1516:1517 -> a
-    959:959:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
-    959:959:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1518 -> a
-    960:960:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1519:1519 -> a
-    961:961:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
-    961:961:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1515 -> a
-    962:965:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1525:1528 -> a
-    966:966:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1560:1560 -> a
-    966:966:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1528 -> a
-    967:967:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    967:967:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1560 -> a
-    967:967:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1528 -> a
-    968:974:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1562:1568 -> a
-    968:974:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1528 -> a
-    975:980:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1536:1541 -> a
-    981:981:boolean lambda$computeMayHaveSideEffects$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1537:1537 -> a
-    982:983:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1582:1583 -> a
-    984:984:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    984:984:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1583 -> a
-    985:989:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1602:1606 -> a
-    985:989:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1584 -> a
-    990:990:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1586:1586 -> a
-    991:998:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1611:1618 -> a
-    991:998:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    999:999:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):970:970 -> a
-    999:999:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618 -> a
-    999:999:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1000:1000:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1618:1618 -> a
-    1000:1000:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1001:1005:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1617:1621 -> a
-    1001:1005:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1587 -> a
-    1006:1006:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724:1724 -> a
-    1007:1007:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
-    1007:1007:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1724 -> a
-    1008:1019:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1727:1738 -> a
-    1020:1022:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1784:1786 -> a
-    1020:1022:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1739 -> a
-    1023:1023:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1742:1742 -> a
-    1024:1025:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1791:1792 -> a
-    1024:1025:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1743 -> a
-    1026:1027:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1796:1797 -> a
-    1026:1027:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1746 -> a
-    1028:1029:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1749:1750 -> a
-    1030:1034:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1770:1774 -> a
-    1030:1034:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1751 -> a
-    1035:1040:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1752:1757 -> a
-    1041:1052: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):1806:1817 -> a
-    1041:1052:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1758 -> a
-    1053:1054:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1732:1733 -> a
-    1055:1055:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1731:1731 -> a
-    1056:1056:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1779:1779 -> a
-    1057:1057:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1855:1855 -> a
-    1058:1058:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    1058:1058:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1856 -> a
-    1059:1076:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1857:1874 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):477:482 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:491 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):542:551 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):561:589 -> b
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):690:690 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):686:686 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
+    5:8:java.util.Set getDesugaredCallSites():345:348 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):449:456 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):389:390 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460:460 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):442:443 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):464 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466:469 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):473:479 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:505 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):506:506 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):542:546 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):561:563 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):627:635 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):886:887 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
+    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):410:411 -> a
+    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637 -> a
+    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646:654 -> a
+    85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    88:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):655:706 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    140:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
+    142:143:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):404:405 -> a
+    142:143:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
+    144:147:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):712:715 -> a
+    148:150:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:398 -> a
+    148:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716 -> a
+    151:152:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718:719 -> a
+    153:154:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):420:421 -> a
+    153:154:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
+    155:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:721 -> a
+    156:157:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):429:430 -> a
+    156:157:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    158:159:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
+    158:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
+    160:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:726 -> a
+    163:164:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):897:898 -> a
+    163:164:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727 -> a
+    165:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):729:729 -> a
+    166:167:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):906:907 -> a
+    166:167:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730 -> a
+    168:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):732:734 -> a
+    171:186:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:748 -> a
+    187:190:com.android.tools.r8.graph.DexType computeOutlineClassType():948:951 -> a
+    187:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    191:191:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():951 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    192:192:com.android.tools.r8.graph.DexType computeOutlineClassType():953:953 -> a
+    192:192:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748 -> a
+    193:245:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):748:800 -> a
+    246:253:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):794:801 -> a
+    254:254:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):665:665 -> a
+    255:255:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):661:661 -> a
+    256:257:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):745:746 -> a
+    258:261:void waveStart(java.util.Collection):805:808 -> a
+    262:262:void addWaveDoneAction(com.android.tools.r8.utils.Action):819:819 -> a
+    263:263:boolean isInWave():829:829 -> a
+    263:263:void addWaveDoneAction(com.android.tools.r8.utils.Action):822 -> a
+    264:264:void addWaveDoneAction(com.android.tools.r8.utils.Action):825:825 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):823:823 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    267:267:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):833:833 -> a
+    268:273:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):843:848 -> a
+    274:291:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):847:864 -> a
+    292:302:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):850:860 -> a
+    303:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):869:872 -> a
+    307:318:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):871:882 -> a
+    319:319:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):916:916 -> a
+    320:329:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):929:938 -> a
+    330:330:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    330:330:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938 -> a
+    331:331:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938:938 -> a
+    332:332:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):937:937 -> a
+    333:336:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):960:963 -> a
+    337:342:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):969:974 -> a
+    343:348:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):978:983 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984 -> a
+    350:350:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    351:351:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):980:980 -> a
+    352:354:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1001:1003 -> a
+    355:355:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1002:1002 -> a
+    356:356:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    357:357:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    357:357:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009 -> a
+    358:358:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1009:1009 -> a
+    359:359:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1005:1005 -> a
+    360:366:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1026:1032 -> a
+    367:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1076 -> a
+    370:375:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1080 -> a
+    376:376:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    376:376:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080 -> a
+    377:377:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1080:1080 -> a
+    378:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1079:1092 -> a
+    392:397:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1890:1895 -> a
+    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1095 -> a
+    398:404:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1096:1102 -> a
+    405:405:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1279:1279 -> a
+    405:405:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1102 -> a
+    406:420:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103:1117 -> a
+    421:421:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    421:421:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1117 -> a
+    422:436:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1118:1132 -> a
+    437:437:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1643 -> a
+    437:437:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    438:438:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    438:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643 -> a
+    438:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    439:441:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1643:1645 -> a
+    439:441:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    442:442:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    442:442:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1645 -> a
+    442:442:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    443:446:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1646:1649 -> a
+    443:446:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1133 -> a
+    447:461:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1141:1155 -> a
+    462:462:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    462:462:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1156 -> a
+    463:566:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1157:1260 -> a
+    567:569:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1037:1039 -> a
+    567:569:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1261 -> a
+    570:578:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1264:1272 -> a
+    579:597:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1271:1289 -> a
+    598:598:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    598:598:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1289 -> a
+    599:622:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1290:1313 -> a
+    623:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1305:1375 -> a
+    694:694:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    694:694:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1375 -> a
+    695:705:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1376:1386 -> a
+    706:711:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):889:894 -> a
+    706:711:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1386 -> a
+    712:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1387:1430 -> a
+    756:760:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1333 -> a
+    756:760:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    761:767:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.CodeRewriter.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):1345:1351 -> a
+    761:767:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
+    761:767:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    768:771:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1338:1341 -> a
+    768:771:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    772:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1431:1435 -> a
+    777:799:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1506:1528 -> a
+    777:799:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1438 -> a
+    800:800:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1439:1439 -> a
+    801:807:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1535:1541 -> a
+    801:807:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1440 -> a
+    808:808:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1441:1441 -> a
+    809:815:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1598:1604 -> a
+    809:815:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1442 -> a
+    816:839:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1477:1500 -> a
+    816:839:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1443 -> a
+    840:840:void com.android.tools.r8.ir.optimize.CodeRewriter.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1329:1329 -> a
+    840:840:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1430 -> a
+    841:843:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1448:1450 -> a
+    844:844:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1287:1287 -> a
+    844:844:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450 -> a
+    845:861:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1451:1467 -> a
+    862:867:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1466:1471 -> a
+    868:868:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1189:1189 -> a
+    869:869:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1315:1315 -> a
+    870:885:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1549:1564 -> a
+    886:899:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:54 -> a
+    886:899:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    900:900:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    900:900:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> a
+    900:900:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    901:909:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> a
+    901:909:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    910:936:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:82 -> a
+    910:936:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    937:992:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> a
+    937:992:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1565 -> a
+    993:993:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    993:993:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    994:995:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1567:1568 -> a
+    996:996:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> a
+    996:996:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1569 -> a
+    997:997:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1570:1570 -> a
+    998:998:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> a
+    998:998:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1566 -> a
+    999:1002:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1576:1579 -> a
+    1003:1003:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1611:1611 -> a
+    1003:1003:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1579 -> a
+    1004:1004:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    1004:1004:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1611 -> a
+    1004:1004:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1579 -> a
+    1005:1011:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1613:1619 -> a
+    1005:1011:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1579 -> a
+    1012:1017:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1587:1592 -> a
+    1018:1018:boolean lambda$computeMayHaveSideEffects$18(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):1588:1588 -> a
+    1019:1020:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1633:1634 -> a
+    1021:1021:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1021:1021:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1634 -> a
+    1022:1026:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1653:1657 -> a
+    1022:1026:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1635 -> a
+    1027:1027:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1637:1637 -> a
+    1028:1035:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1662:1669 -> a
+    1028:1035:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1036:1036:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1017:1017 -> a
+    1036:1036:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669 -> a
+    1036:1036:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1037:1037:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1669:1669 -> a
+    1037:1037:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1038:1042:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1668:1672 -> a
+    1038:1042:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1638 -> a
+    1043:1043:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775:1775 -> a
+    1044:1044:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1263:1263 -> a
+    1044:1044:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1775 -> a
+    1045:1056:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1778:1789 -> a
+    1057:1059:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1835:1837 -> a
+    1057:1059:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1790 -> a
+    1060:1060:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1793:1793 -> a
+    1061:1062:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1842:1843 -> a
+    1061:1062:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1794 -> a
+    1063:1064:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1847:1848 -> a
+    1063:1064:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    1065:1066:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1800:1801 -> a
+    1067:1071:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1821:1825 -> a
+    1067:1071:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1802 -> a
+    1072:1077:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1803:1808 -> a
+    1078:1089: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):1857:1868 -> a
+    1078:1089:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809 -> a
+    1090:1091:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1783:1784 -> a
+    1092:1092:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.graph.DexItemFactory):1782:1782 -> a
+    1093:1093:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1830:1830 -> a
+    1094:1094:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1906:1906 -> a
+    1095:1095:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    1095:1095:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1907 -> a
+    1096:1113:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1908:1925 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):485:490 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):488:499 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):550:559 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):569:597 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):589:593 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):593:599 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597:601 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601:607 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:604 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:601 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):601 -> b
-    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):602:602 -> b
-    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):737:739 -> b
-    86:86:boolean isInWave():808:808 -> b
-    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):945:947 -> b
-    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1003:1011 -> b
-    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1009:1009 -> b
-    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1627:1632 -> b
-    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1630:1634 -> b
-    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673:1673 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604:609 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
+    82:82:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> b
+    83:85:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):754:756 -> b
+    86:86:boolean isInWave():829:829 -> b
+    87:89:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):992:994 -> b
+    90:98:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1050:1058 -> b
+    99:99:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1056:1056 -> b
+    100:105:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1678:1683 -> b
+    106:110:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681:1685 -> b
+    111:111:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724:1724 -> b
     112:112:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1300:1300 -> b
-    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1673 -> b
-    113:129:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1677:1693 -> b
-    130:133:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1823:1826 -> b
-    130:133:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    134:134:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
-    134:134:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1826 -> b
-    134:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    135:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1827:1835 -> b
-    135:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1704 -> b
-    144:148:boolean lambda$workaroundForwardingInitializerBug$17(com.android.tools.r8.ir.code.Instruction):1695:1699 -> b
-    149:150:void printPhase(java.lang.String):1849:1850 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):504:523 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):522:528 -> c
+    112:112:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1724 -> b
+    113:129:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1728:1744 -> b
+    130:133:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1874:1877 -> b
+    130:133:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    134:134:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
+    134:134:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1877 -> b
+    134:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    135:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1878:1886 -> b
+    135:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1755 -> b
+    144:148:boolean lambda$workaroundForwardingInitializerBug$19(com.android.tools.r8.ir.code.Instruction):1746:1750 -> b
+    149:150:void printPhase(java.lang.String):1900:1901 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512:531 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):530:536 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):528:528 -> c
-    43:47:com.android.tools.r8.graph.DexApplication optimize():609:613 -> c
-    48:49:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexProgramClass):813:814 -> c
-    50:50:void lambda$computeReachabilitySensitivity$10(com.android.tools.r8.graph.DexEncodedMethod):814:814 -> c
-    51:56:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1650:1655 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):536:536 -> c
+    43:47:com.android.tools.r8.graph.DexApplication optimize():617:621 -> c
+    48:49:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):834:835 -> c
+    50:50:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):835:835 -> c
+    51:56:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1701:1706 -> c
     57:57:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1312:1312 -> c
-    57:57:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1655 -> c
-    58:58:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656:1656 -> c
-    59:71:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4309 -> c
-    59:71:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> c
-    72:72:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> c
-    72:72:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310 -> c
-    72:72:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> c
-    73:74:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4310:4311 -> c
-    73:74:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> c
-    75:75:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4297:4297 -> c
-    75:75:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1656 -> c
-    76:85:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1658:1667 -> c
-    86:86:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1666:1666 -> c
+    57:57:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1706 -> c
+    58:58:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707:1707 -> c
+    59:71:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4321 -> c
+    59:71:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> c
+    72:72:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> c
+    72:72:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322 -> c
+    72:72:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> c
+    73:74:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4322:4323 -> c
+    73:74:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> c
+    75:75:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):4309:4309 -> c
+    75:75:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1707 -> c
+    76:85:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1709:1718 -> c
+    86:86:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1717:1717 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):536:536 -> d
-    2:2:void clearDexMethodCompilationState():865:865 -> d
-    1:7:boolean enableTryWithResourcesDesugaring():364:370 -> e
-    8:8:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):481:481 -> e
-    9:13:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1638:1642 -> e
-    1:1:boolean enableTwrCloseResourceDesugaring():360:360 -> f
-    2:2:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):520:520 -> f
-    1:2:boolean removeLambdaDeserializationMethods():374:375 -> g
-    1:3:void waveDone():792:794 -> h
-    1:1:void waveStart():788:788 -> i
+    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):544:544 -> d
+    2:2:void clearDexMethodCompilationState():912:912 -> d
+    1:7:boolean enableTryWithResourcesDesugaring():371:377 -> e
+    8:8:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):489:489 -> e
+    9:13:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):874:878 -> e
+    1:1:boolean enableTwrCloseResourceDesugaring():367:367 -> f
+    2:2:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):528:528 -> f
+    3:3:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):808:808 -> f
+    1:2:boolean removeLambdaDeserializationMethods():381:382 -> g
+    3:7:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1689:1693 -> g
+    1:3:void waveDone():813:815 -> h
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.w.c.P:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():76:76 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):83:83 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):80:85 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):76:76 -> a
-    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):76:76 -> a
-    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):89:93 -> a
-    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):100:110 -> a
-    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):479:499 -> a
-    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):112 -> a
-    40:56:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:131 -> a
-    57:61:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):506:510 -> a
-    57:61:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    62:64:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):535:537 -> a
-    62:64:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):510 -> a
-    62:64:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    65:81:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:527 -> a
-    65:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    82:98:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:149 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
-    99:99:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):149 -> a
-    100:103:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150:153 -> a
-    104:144:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):152:192 -> a
-    145:178:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):434:467 -> a
-    145:178:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    179:179:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):458:458 -> a
-    179:179:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    180:180:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):457:457 -> a
-    180:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
-    181:188:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):194:201 -> a
-    189:192:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):616:619 -> a
-    189:192:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    193:193:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
-    193:193:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):619 -> a
-    193:193:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    194:212:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):621:639 -> a
-    194:212:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    213:213:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    213:213:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):639 -> a
-    213:213:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    214:220:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):641:647 -> a
-    214:220:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):200 -> a
-    221:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):203:220 -> a
-    239:255:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):219:235 -> a
-    256:272:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):230:246 -> a
-    273:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):245:255 -> a
-    284:284: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
-    284:284:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):259 -> a
-    285:322:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):260:297 -> a
-    323:332:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):296:305 -> a
-    333:348:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):304:319 -> a
-    349:365:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):318:334 -> a
-    366:388:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):333:355 -> a
-    389:399:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):354:364 -> a
-    400:406:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):363:369 -> a
-    407:413:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
-    414:420:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:379 -> a
-    421:428:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):378:385 -> a
-    429:435:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):384:390 -> a
-    436:465:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):389:418 -> a
-    466:466:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    466:466:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418 -> a
-    467:471:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):418:422 -> a
-    472:478:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):177:183 -> a
-    479:479: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
-    479:479:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):183 -> a
-    480:480:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    480:480:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):542 -> a
-    481:515:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):543:577 -> a
-    516:516:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    516:516:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):577 -> a
-    517:528:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):578:589 -> a
-    529:529:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
-    530:530:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
-    531:531:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):374:374 -> a
-    532:532:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
-    533:533:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
-    534:534:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):396:396 -> a
-    535:540:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):596:601 -> a
-    541:541:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):651:651 -> a
-    542:548:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):655:661 -> a
-    549:549:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    549:549:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):661 -> a
-    550:550:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
+    1:1:void <clinit>():75:75 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):82:82 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter):79:84 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):75:75 -> a
+    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):75:75 -> a
+    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):88:92 -> a
+    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):99:109 -> a
+    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
+    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
+    40:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:132 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
+    60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
+    64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
+    105:138:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):439:472 -> a
+    105:138:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    139:139:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):463:463 -> a
+    139:139:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    140:140:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):462:462 -> a
+    140:140:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    141:148:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):177:184 -> a
+    149:152:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):621:624 -> a
+    149:152:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    153:153:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
+    153:153:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):624 -> a
+    153:153:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    154:172:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):626:644 -> a
+    154:172:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    173:173:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    173:173:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):644 -> a
+    173:173:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    174:180:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):646:652 -> a
+    174:180:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
+    181:198:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):186:203 -> a
+    199:215:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):202:218 -> a
+    216:243:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):213:240 -> a
+    244:244:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):239:239 -> a
+    245:245: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
+    245:245:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):243 -> a
+    246:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):244:281 -> a
+    284:293:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):280:289 -> a
+    294:309:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):288:303 -> a
+    310:326:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):302:318 -> a
+    327:349:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):317:339 -> a
+    350:360:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):338:348 -> a
+    361:367:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):347:353 -> a
+    368:374:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):352:358 -> a
+    375:381:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):357:363 -> a
+    382:389:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):362:369 -> a
+    390:396:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):368:374 -> a
+    397:429:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):373:405 -> a
+    430:436:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):160:166 -> a
+    437:437: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
+    437:437:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):166 -> a
+    438:438:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    438:438:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):547 -> a
+    439:473:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):548:582 -> a
+    474:474:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    474:474:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):582 -> a
+    475:486:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):583:594 -> a
+    487:487:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):348:348 -> a
+    488:488:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):353:353 -> a
+    489:489:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):358:358 -> a
+    490:490:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):364:364 -> a
+    491:491:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):369:369 -> a
+    492:492:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):380:380 -> a
+    493:496:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):409:412 -> a
+    497:506:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):411:420 -> a
+    507:511:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):511:515 -> a
+    507:511:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    512:514:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):540:542 -> a
+    512:514:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):515 -> a
+    512:514:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    515:531:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):516:532 -> a
+    515:531:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
+    532:535:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):421:424 -> a
+    536:541:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):601:606 -> a
+    542:542:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):656:656 -> a
+    543:549:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):660:666 -> a
+    550:550:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     550:550:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):666 -> a
-    551:554:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):669:672 -> 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):391:391 -> b
+    551:551:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    551:551:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):671 -> a
+    552:555:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):674:677 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.w.c.O:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
@@ -27810,10 +27855,10 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():675:675 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):683:687 -> <init>
-    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):692:705 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):702:702 -> a
+    1:1:void <clinit>():680:680 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):688:692 -> <init>
+    1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
 com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.w.c.Q:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -27850,8 +27895,8 @@
     26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
     31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
     32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
-    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
-    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.utils.Action,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
     60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
 com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.w.c.T:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
@@ -27975,7 +28020,7 @@
     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():1390:1392 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1425:1427 -> 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
@@ -28001,10 +28046,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> 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):961:961 -> 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):959:959 -> 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
@@ -28137,7 +28182,7 @@
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:7:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApiLevel):78:84 -> a
     8:8:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     9:9:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     10:17:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
     18:36:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
@@ -28178,7 +28223,7 @@
     1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1296 -> a
     3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1295 -> a
     4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:24:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1320 -> a
     25:25:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -28419,47 +28464,91 @@
 com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.w.d.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):51:53 -> <init>
-    1:5:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):95:99 -> a
-    6:8:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):113:115 -> a
-    9:24:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):121:136 -> a
-    25:26: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):222:223 -> a
-    25:26:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    27:27: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):239:239 -> a
-    27:27: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):223 -> a
-    27:27:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    28:28: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):239 -> a
-    28:28: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):223 -> a
-    28:28:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    29:31: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):224:226 -> a
-    29:31:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):139 -> a
-    32:59:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):143:170 -> a
-    60:63: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):213:216 -> a
-    60:63:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    64:64: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):239:239 -> a
-    64:64: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):216 -> a
-    64:64:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    65:65: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):239 -> a
-    65:65: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):216 -> a
-    65:65:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    66:66: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):217:217 -> a
-    66:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):172 -> a
-    67:89:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):171:193 -> a
-    90:90: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
-    90:90:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):189 -> a
-    91:101:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):197:207 -> a
-    102:105:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:235 -> a
-    106:106:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):234:234 -> a
-    107:107:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    107:107:void desugar(com.android.tools.r8.ir.code.IRCode):61 -> a
-    108:120:void desugar(com.android.tools.r8.ir.code.IRCode):62:74 -> a
-    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    121:121:void desugar(com.android.tools.r8.ir.code.IRCode):74 -> a
-    122:134:void desugar(com.android.tools.r8.ir.code.IRCode):75:87 -> a
+    java.util.Map callBackMethods -> d
+    com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):64:64 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):62:67 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):72:72 -> a
+    2:9:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):111:118 -> a
+    2:9:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    10:10:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):118 -> a
+    10:10:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    11:11:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):122:122 -> a
+    11:11:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    12:20:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):132:140 -> a
+    12:20:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):125 -> a
+    12:20:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    21:21:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140 -> a
+    21:21:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):125 -> a
+    21:21:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    22:29:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):144:151 -> a
+    22:29:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):125 -> a
+    22:29:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    30:30:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):126:126 -> a
+    30:30:void desugar(com.android.tools.r8.ir.code.IRCode):76 -> a
+    31:31:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    31:31:void desugar(com.android.tools.r8.ir.code.IRCode):78 -> a
+    32:44:void desugar(com.android.tools.r8.ir.code.IRCode):79:91 -> a
+    45:45:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    45:45:void desugar(com.android.tools.r8.ir.code.IRCode):91 -> a
+    46:51:void desugar(com.android.tools.r8.ir.code.IRCode):92:97 -> a
+    52:63:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):235:246 -> a
+    52:63:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    64:65: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):326:327 -> a
+    64:65:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    64:65:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    66:66: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):350:350 -> a
+    66:66: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):327 -> a
+    66:66:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    66:66:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    67:67: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):350 -> a
+    67:67: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):327 -> a
+    67:67:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    67:67:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    68: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):328:330 -> a
+    68:70:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):249 -> a
+    68:70:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    71:94:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):252:275 -> a
+    71:94:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    95:98: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):317:320 -> a
+    95:98:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    95:98:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    99:99: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):350:350 -> a
+    99:99: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):320 -> a
+    99:99:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    99:99:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    100:100: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):350 -> a
+    100:100: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):320 -> a
+    100:100:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    100:100:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    101:101: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):321:321 -> a
+    101:101:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):277 -> a
+    101:101:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    102:123:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):276:297 -> a
+    102:123:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    124:124: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
+    124:124:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):293 -> a
+    124:124:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    125:125:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():16:16 -> a
+    125:125:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):301 -> a
+    125:125:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    126:135:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):302:311 -> a
+    126:135:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    136:138:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:175 -> a
+    139:153:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):179:193 -> a
+    154:159:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):199:204 -> a
+    160:164:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):209:213 -> a
+    165:175:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):336:346 -> a
+    176:176:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):345:345 -> a
+    177:178:boolean canConvert(com.android.tools.r8.graph.DexType):354:355 -> a
+    1:10:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):160:169 -> b
+    11:13:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):227:229 -> b
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.w.d.i:
     java.util.Map rewritePrefix -> c
     java.util.Map emulateLibraryInterface -> d
@@ -28471,7 +28560,7 @@
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
     1:9:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List):59:67 -> <init>
     1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):71:71 -> a
-    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():21:21 -> a
+    2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):72 -> a
     3:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):73:73 -> a
     4:4:java.util.Map getBackportCoreLibraryMember():97:97 -> a
@@ -28573,7 +28662,115 @@
     88:88:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48:48 -> a
     89:91:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     89:91:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48 -> a
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.w.d.k:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.w.d.k:
+    java.util.Map typeWrappers -> b
+    java.util.Map vivifiedTypeWrappers -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexItemFactory factory -> f
+    java.util.Set invalidWrappers -> d
+    java.util.Set generatedWrappers -> e
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> g
+    1:1:void <clinit>():95:95 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):115:115 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):101:118 -> <init>
+    1:1:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):130:130 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):130 -> a
+    3:3:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):134:134 -> a
+    4:19:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):159:174 -> a
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    20:20:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):174 -> a
+    21:32:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):176:187 -> a
+    33:34:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):178:179 -> a
+    35:37:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    35:37:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):181 -> a
+    38:38:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):189:189 -> a
+    39:42:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):165:168 -> a
+    43:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):167:170 -> a
+    47:47:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193:193 -> a
+    48:52:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> a
+    48:52:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    53:56:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:198 -> a
+    57:71:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):293:307 -> a
+    57:71:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    72:72:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):307 -> a
+    72:72:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    73:75:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):308:310 -> a
+    73:75:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    76:76:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():252:252 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):313 -> a
+    76:76:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    77:92:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):314:329 -> a
+    77:92:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    93:98:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> a
+    93:98:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):331 -> a
+    93:98:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    99:99:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:195 -> a
+    100:117:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):219:236 -> a
+    118:121:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):430:433 -> a
+    118:121:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    122:130:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):431:439 -> a
+    122:130:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    131:136:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    131:136:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):435 -> a
+    131:136:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240 -> a
+    137:141:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedField):240:244 -> a
+    142:142:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):346:346 -> a
+    143:143:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):346:346 -> a
+    144:153:void reportFinalMethodsInWrapper(java.util.Set):346:355 -> a
+    154:154:void reportFinalMethodsInWrapper(java.util.Set):350:350 -> a
+    155:163:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):361:369 -> a
+    164:187:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):374:397 -> a
+    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    188:188:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):397 -> a
+    189:193:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):398:402 -> a
+    194:194:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    194:194:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):402 -> a
+    195:204:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):403:412 -> a
+    205:207:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):461:463 -> a
+    208:208:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478:478 -> a
+    209:213:boolean verifyAllClassesGenerated():489:493 -> a
+    209:213:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):478 -> a
+    214:217:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):479:482 -> a
+    218:219:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):500:501 -> a
+    218:219:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):483 -> a
+    220:220:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Map,java.util.function.BiConsumer):484:484 -> a
+    221:229:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):505:513 -> a
+    230:230:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):508:508 -> a
+    231:231:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):507:507 -> a
+    232:234:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):533:535 -> a
+    235:259:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):534:558 -> a
+    260:265:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):444:449 -> a
+    260:265:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):560 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:4:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):204:206 -> b
+    5:9:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:426 -> b
+    5:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206 -> b
+    10:10:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210:210 -> b
+    11:24:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):249:262 -> b
+    11:24:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):262 -> b
+    25:25:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    26:28:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):263:265 -> b
+    26:28:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    29:29:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():252:252 -> b
+    29:29:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):270 -> b
+    29:29:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    30:45:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):271:286 -> b
+    30:45:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    46:51:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):336:341 -> b
+    46:51:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):288 -> b
+    46:51:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):210 -> b
+    52:52:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207:207 -> b
+    53:60:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:524 -> b
+    61:61:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> b
+    62:62:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):518:518 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):142:142 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):122:122 -> d
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.w.d.l:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -28588,439 +28785,431 @@
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):133:133 -> <init>
     2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):102:139 -> <init>
-    1:6:void initializeEmulatedInterfaceVariables():147:152 -> a
+    1:6:void initializeEmulatedInterfaceVariables():143:148 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    7:7:void initializeEmulatedInterfaceVariables():152 -> a
-    8:9:void initializeEmulatedInterfaceVariables():155:156 -> a
-    10:10:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
-    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164 -> a
-    12:14:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):164:166 -> a
-    15:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165:165 -> a
-    16:23:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:170 -> a
-    24:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):169:169 -> a
-    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):167:167 -> a
-    26:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):181:236 -> a
-    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
-    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):237 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):238:238 -> a
-    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236:244 -> a
-    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> a
-    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:246 -> a
-    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):244:275 -> a
-    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:276 -> a
-    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278 -> a
-    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279:280 -> a
-    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:294 -> a
-    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):857:858 -> a
-    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293 -> a
-    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:295 -> a
-    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):296 -> a
-    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):297:297 -> a
-    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):295:333 -> a
-    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
-    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:335 -> a
-    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:342 -> a
-    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> a
-    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> a
-    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> a
-    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
-    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):344:344 -> a
-    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):342:342 -> a
-    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):316:318 -> a
+    7:7:void initializeEmulatedInterfaceVariables():148 -> a
+    8:9:void initializeEmulatedInterfaceVariables():151:152 -> a
+    10:10:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:159 -> a
+    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    11:11:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
+    12:14:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
+    15:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161:161 -> a
+    16:23:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
+    24:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165:165 -> a
+    25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
+    26:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318 -> a
-    221:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):318:356 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:352 -> a
     260:260:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):356 -> a
-    261:261:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:366 -> a
-    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    262:262:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366 -> a
-    263:275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:378 -> a
-    276:276:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):240:240 -> a
-    277:277:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):390:390 -> a
+    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
+    261:261:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:362 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    262:262:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    263:275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    276:276:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    277:277:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:386 -> a
     278:278:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    278:278:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):390 -> a
-    279:280:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):390:391 -> a
-    281:282:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):541:542 -> a
-    281:282:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
-    283:283:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:392 -> a
-    284:284:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> a
-    284:284:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392 -> a
-    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
-    287:289:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    287:289:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    290:290:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    290:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):395 -> a
-    291:292:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):396:397 -> a
-    293:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):393:393 -> a
-    294:294:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468:468 -> a
+    278:278:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386 -> a
+    279:280:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
+    281:282:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    281:282:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):387 -> a
+    283:283:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:388 -> a
+    284:284:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    284:284:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388 -> a
+    285:286:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:389 -> a
+    287:289:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    287:289:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    290:290:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    290:290:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):391 -> a
+    291:292:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):392:393 -> a
+    293:293:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):389:389 -> a
+    294:294:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:464 -> a
     295:295:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    295:295:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468 -> a
-    296:297:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):469:470 -> a
-    298:298:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> a
-    298:298:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):472 -> a
-    299:313:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):476:490 -> a
+    295:295:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464 -> a
+    296:297:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):465:466 -> a
+    298:298:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    298:298:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468 -> a
+    299:313:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:486 -> a
     314:314:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    314:314:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):490 -> a
-    315:328:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):494:507 -> a
+    314:314:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):486 -> a
+    315:328:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):490:503 -> a
     329:329:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    329:329:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
+    329:329:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
     330:330:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     330:330:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    330:330:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507 -> a
-    331:345:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):507:521 -> a
+    330:330:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    331:345:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
     346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    346:346:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
+    346:346:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
     347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    347:347:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521 -> a
-    348:348:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):521:521 -> a
-    349:349:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):528:528 -> a
-    350:355:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):591:596 -> a
+    347:347:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    348:348:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    349:349:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    350:355:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:592 -> a
     356:356:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    356:356:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):596 -> a
-    357:366:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):598:607 -> a
+    356:356:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):592 -> a
+    357:366:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):594:603 -> a
     367:367:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    367:367:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):607 -> a
-    368:368:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):609:609 -> a
-    369:370:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):759:760 -> a
+    367:367:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):603 -> a
+    368:368:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):605:605 -> a
+    369:370:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:756 -> a
     371:371:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    371:371:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760 -> a
-    372:376:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):764:768 -> a
-    377:377:java.lang.String getCompanionClassDescriptor(java.lang.String):775:775 -> a
-    378:381:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):780:783 -> a
-    382:386:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792:796 -> a
-    387:396:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):841:850 -> a
-    397:397:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):847:847 -> a
-    398:398:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    399:399:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869:869 -> a
-    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):865:865 -> a
-    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):869 -> a
-    401:403:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):930:932 -> a
-    404:404:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968:968 -> a
-    405:405:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    405:405:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):968 -> a
-    406:409:java.util.Map processEmulatedInterfaceHierarchy():579:582 -> a
-    406:409:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560 -> a
-    406:409:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    410:411:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):561:562 -> a
-    410:411:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    371:371:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):756 -> a
+    372:376:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760:764 -> a
+    377:377:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    378:381:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> a
+    382:386:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    387:396:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    397:397:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    398:398:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    399:399:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    401:403:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    404:404:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    405:405:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    405:405:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    406:409:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    406:409:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    406:409:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    410:411:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:558 -> a
+    410:411:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     412:412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    412:412:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):562 -> a
-    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    413:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):564:568 -> a
-    413:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    418:419:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:641 -> a
-    418:419:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    418:419:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    420:420:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> a
-    420:420:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642 -> a
-    420:420:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    420:420:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    421:423:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:645 -> a
-    421:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    421:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    424:430:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):644:650 -> a
-    424:430:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    424:430:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    431:431:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    431:431:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652 -> a
-    431:431:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    431:431:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    432:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):652:652 -> a
-    432:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    432:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    433:451:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651:669 -> a
-    433:451:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    433:451:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    412:412:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):558 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    413:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:564 -> a
+    413:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:423:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:641 -> a
+    418:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    418:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    424:430:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    424:430:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    424:430:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    431:431:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    431:431:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    431:431:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    431:431:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    432:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    432:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    432:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:451:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:665 -> a
+    433:451:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:451:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    452:452:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):669 -> a
-    452:452:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    452:452:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    453:453:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
-    453:453:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    453:453:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    454:460:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):616:622 -> a
-    454:460:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670 -> a
-    454:460:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    454:460:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    452:452:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665 -> a
+    452:452:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    452:452:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    453:453:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666:666 -> a
+    453:453:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    453:453:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    454:460:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:618 -> a
+    454:460:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    454:460:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    454:460:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     461:461:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    461:461:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):622 -> a
-    461:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670 -> a
-    461:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    461:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    462:462:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):624:624 -> a
-    462:462:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670 -> a
-    462:462:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    462:462:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    463:467:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:675 -> a
-    463:467:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    463:467:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    468:470:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    468:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    468:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    468:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    471:471:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676:676 -> a
-    471:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    471:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    472:472:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):674:674 -> a
-    472:472:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    472:472:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    473:473:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):671:671 -> a
-    473:473:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    473:473:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    474:474:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    474:474:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    474:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    474:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    475:476:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:685 -> a
-    475:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    475:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
+    461:461:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):618 -> a
+    461:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    461:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    461:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:462:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):620:620 -> a
+    462:462:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:462:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:462:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    463:467:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    463:467:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    463:467:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    468:470:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    468:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    468:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    468:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:471:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    471:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    472:472:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    472:472:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    472:472:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    473:473:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    473:473:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    473:473:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    474:474:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    474:474:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    474:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    474:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    475:476:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:681 -> a
+    475:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    475:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    477:477:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
-    477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    478:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:688 -> a
-    478:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    478:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    481:481:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689 -> a
-    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    483:483:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
-    483:483:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694 -> a
-    483:483:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    483:483:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    484:484:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694:694 -> a
-    484:484:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    484:484:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    485:487:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1248 -> a
-    485:487:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    485:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    485:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    488:488:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695:695 -> a
-    488:488:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    488:488:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    489:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):693:693 -> a
-    489:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    489:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    491:491:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1246:1246 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    492:492:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:701 -> a
-    492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    493:495:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):633:635 -> a
-    493:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    493:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    493:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    496:496:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):632:632 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703 -> a
-    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):703:703 -> a
-    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):702:702 -> a
-    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    499:540:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:742 -> a
-    499:540:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):567 -> a
-    499:540:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    541:541:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    541:541:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570 -> a
-    541:541:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    542:543:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):570:571 -> a
-    542:543:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):969 -> a
-    544:554:void duplicateEmulatedInterfaces():940:950 -> a
-    544:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    555:560:void duplicateEmulatedInterfaces():949:954 -> a
-    555:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:975 -> a
-    562:563:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1030:1031 -> a
-    562:563:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    564:565:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    564:565:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1032 -> a
-    564:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    566:569:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1033:1036 -> a
-    566:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    570:576:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975:981 -> a
-    577:579:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1015 -> a
-    577:579:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    580:581:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1008:1009 -> a
-    580:581:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1016 -> a
-    580:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    582:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1017:1026 -> a
-    582:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    592:596:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    597:597:boolean isInMainDexList(com.android.tools.r8.graph.DexType):819:819 -> a
-    597:597:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    598:602:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986:990 -> a
-    603:603:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    603:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990 -> a
-    604:605:void renameEmulatedInterfaces():885:886 -> a
-    604:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    606:614:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):898:906 -> a
-    606:614:void renameEmulatedInterfaces():887 -> a
-    606:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):917:920 -> a
-    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906 -> a
-    615:618:void renameEmulatedInterfaces():887 -> a
-    615:618:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    619:619:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):908:908 -> a
-    619:619:void renameEmulatedInterfaces():887 -> a
-    619:619:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
+    477:477:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    478:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:684 -> a
+    478:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    478:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:483:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    483:483:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    483:483:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:483:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    484:484:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    484:484:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    484:484:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    485:487:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1263 -> a
+    485:487:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    485:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    485:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    488:488:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    488:488:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    488:488:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    489:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    489:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    489:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1261 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    492:492:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    493:495:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):629:631 -> a
+    493:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    493:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    493:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    496:496:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:540:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    499:540:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    499:540:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    541:541:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    541:541:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    541:541:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    542:543:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    542:543:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    544:554:void duplicateEmulatedInterfaces():936:946 -> a
+    544:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    555:560:void duplicateEmulatedInterfaces():945:950 -> a
+    555:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    562:563:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    562:563:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    564:565:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    564:565:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    564:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    566:569:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    566:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    570:576:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    577:579:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    577:579:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    580:581:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    580:581:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    580:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    582:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    582:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:596:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    597:597:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    597:597:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    598:602:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    603:603:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    603:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    604:605:void renameEmulatedInterfaces():881:882 -> a
+    604:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    606:614:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    606:614:void renameEmulatedInterfaces():883 -> a
+    606:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:916 -> a
+    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    615:618:void renameEmulatedInterfaces():883 -> a
+    615:618:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    619:619:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:904 -> a
+    619:619:void renameEmulatedInterfaces():883 -> a
+    619:619:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
     620:620:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    620:620:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):908 -> a
-    620:620:void renameEmulatedInterfaces():887 -> a
-    620:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    621:621:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):910:910 -> a
-    621:621:void renameEmulatedInterfaces():887 -> a
-    621:621:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    622:624:void renameEmulatedInterfaces():888:890 -> a
-    622:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    625:627:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):924:926 -> a
-    625:627:void renameEmulatedInterfaces():891 -> a
-    625:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):991 -> a
-    628:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):994:994 -> a
-    629:631:void clear():1001:1003 -> a
-    629:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    632:646:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1040:1054 -> a
-    647:647:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1047:1047 -> a
-    648:648:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071:1071 -> a
-    649:649:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
-    649:649:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1071 -> a
-    650:653:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1074:1077 -> a
-    654:654:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093:1093 -> a
-    655:656:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1107 -> a
-    655:656:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    620:620:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904 -> a
+    620:620:void renameEmulatedInterfaces():883 -> a
+    620:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    621:621:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906:906 -> a
+    621:621:void renameEmulatedInterfaces():883 -> a
+    621:621:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    622:624:void renameEmulatedInterfaces():884:886 -> a
+    622:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    625:627:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    625:627:void renameEmulatedInterfaces():887 -> a
+    625:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    628:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    629:631:void clear():997:999 -> a
+    629:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    632:646:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    647:647:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    648:648:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    649:649:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    649:649:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    650:653:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    654:654:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1089:1089 -> a
+    655:656:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    655:656:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     657:657:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    657:657:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1107 -> a
-    657:657:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    658:659:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1063:1064 -> a
-    658:659:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109 -> a
-    658:659:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1110:1129 -> a
-    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    680:680:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> 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):1129 -> 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):1097 -> a
+    657:657:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1103 -> a
+    657:657:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    658:659:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    658:659:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1105 -> a
+    658:659:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    680:680:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     681:681:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    681:681:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
-    681:681:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    681:681:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    681:681:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    681:681:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    681:681:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     682:682:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    682:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
-    682:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    682:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
-    683:683:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129 -> a
-    683:683:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    684:700:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1149 -> a
-    684:700:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    701:701:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1098:1098 -> a
-    702:704:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1115 -> a
-    702:704:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
+    682:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    682:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    682:682:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    683:683:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    683:683:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    684:700:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1129:1145 -> a
+    684:700:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    701:701:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1094:1094 -> a
+    702:704:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109:1111 -> a
+    702:704:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
     705:705:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    705:705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115 -> a
-    705:705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    706:706:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1115:1115 -> a
-    706:706:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1097 -> a
-    707:707:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1154:1154 -> a
+    705:705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
+    705:705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    706:706:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1111 -> a
+    706:706:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    707:707:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
     708:708:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    708:708:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1156 -> a
+    708:708:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
     709:709:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    709:709:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1157 -> a
-    710:710:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1159:1159 -> a
-    1:1:boolean isDefaultOrStatic(com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
-    2:2:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):175:175 -> b
-    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:532 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
-    4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532 -> b
-    5:9:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):532:536 -> b
-    10:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):752:753 -> b
-    12:12:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):746:746 -> b
-    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):754 -> b
-    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):755:755 -> b
-    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879:879 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):875:875 -> b
-    15:15:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):879 -> b
-    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:811 -> c
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
-    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:814 -> c
-    7:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:815 -> c
-    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> c
-    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825 -> c
-    12:12:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):825:825 -> c
-    13:13:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):835:835 -> c
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):801:801 -> d
-    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1082 -> d
-    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):806:806 -> d
-    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1083 -> d
-    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1085:1085 -> d
+    709:709:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    710:710:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751:751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
+    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
+    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> c
+    7:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):809:811 -> c
+    10:10:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    11:11:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
+    11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> c
+    12:12:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
+    13:13:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):831:831 -> c
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> d
+    2:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1077:1078 -> d
+    4:4:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):802:802 -> d
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1079 -> d
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081:1081 -> d
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
-    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1085 -> d
-    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1086:1086 -> d
+    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1081 -> d
+    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1082:1082 -> d
     8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> d
-    8:8:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1086 -> d
-    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):402:404 -> e
-    4:15:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):420:431 -> e
-    4:15:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
+    8:8:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1082 -> d
+    1:3:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):398:400 -> e
+    4:15:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):416:427 -> e
+    4:15:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    16:16:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):431 -> e
-    16:16:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    17:25:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):433:441 -> e
-    17:25:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
+    16:16:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):427 -> e
+    16:16:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    17:25:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):429:437 -> e
+    17:25:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
     26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    26:26:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):441 -> e
-    26:26:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    27:33:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):443:449 -> e
-    27:33:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
+    26:26:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):437 -> e
+    26:26:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    27:33:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):439:445 -> e
+    27:33:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
     34:34:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    34:34:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):449 -> e
-    34:34:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    35:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):451:462 -> e
-    35:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):410 -> e
-    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):412:412 -> e
-    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):550:555 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.w.d.k$a:
+    34:34:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):445 -> e
+    34:34:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    35:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementing(com.android.tools.r8.graph.DexMethod):447:458 -> e
+    35:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
+    47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):408:408 -> e
+    48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):546:551 -> e
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.w.d.l$a:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:5:void <clinit>():126:130 -> <clinit>
     1:1:void <init>(java.lang.String,int):122:122 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.w.d.l:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.w.d.m:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -29064,15 +29253,15 @@
     145:145:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):330:330 -> a
     145:145:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):120 -> a
     146:164:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):155:173 -> a
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):787:787 -> a
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     165:165:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):173 -> a
     166:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):174:194 -> a
     187:211:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):198:222 -> a
-    212:212:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):830:830 -> a
+    212:212:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
     212:212:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):222 -> a
     213:227:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:238 -> a
     228:280:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):215:267 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.w.d.m:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.w.d.n:
     com.android.tools.r8.graph.DexMethod mainMethod -> o
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23:24 -> <init>
     1:1:void lambda$prepareInstructions$0(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -29084,7 +29273,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.w.d.t:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.w.d.u:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexField lambdaField -> g
@@ -29156,7 +29345,7 @@
     39:47:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():290:298 -> e
     39:47:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> e
     48:59:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.w.d.n:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.w.d.o:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():665:665 -> <clinit>
@@ -29167,27 +29356,27 @@
     3:26:boolean ensureAccessibility():675:698 -> a
     27:27:boolean ensureAccessibility():696:696 -> a
     28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):691:691 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.w.d.o:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.w.d.p:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):624:625 -> <init>
     1:24:boolean ensureAccessibility():632:655 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.w.d.p:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.w.d.q:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():574:574 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):576:577 -> <init>
     1:27:boolean ensureAccessibility():584:610 -> a
     28:35:boolean ensureAccessibility():609:616 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.w.d.q:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.w.d.r:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):543:543 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.w.d.r:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.w.d.s:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():553:553 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):555:556 -> <init>
     1:5:boolean ensureAccessibility():562:566 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.w.d.s:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.w.d.t:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -29196,7 +29385,7 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):494:498 -> <init>
     boolean ensureAccessibility() -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):505:505 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.w.d.u:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.w.d.v:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -29205,7 +29394,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.w.d.v:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.w.d.w:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
@@ -29215,13 +29404,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.w.d.w:
+com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.w.d.x:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
     1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):37:37 -> a
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> c
     1:21:void prepareInstructions():24:44 -> h
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.w.d.x:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.w.d.y:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -29268,7 +29457,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.w.d.y:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.w.d.z:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):28:28 -> <init>
@@ -29277,7 +29466,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):426:426 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> 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
@@ -29287,12 +29476,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -29304,7 +29493,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):426:426 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -29350,7 +29539,7 @@
     80:81:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
     80:81:void prepareInstructions():222 -> h
     82:112:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.w.d.z:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.w.d.B:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -29363,87 +29552,97 @@
     com.android.tools.r8.graph.DexMethod objectInitMethod -> d
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> i
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):91:91 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):73:102 -> <init>
-    1:18:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):111:128 -> a
-    19:30: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):335:346 -> a
-    19:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    31:31:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    31:31: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):345 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    32:65: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):348:381 -> a
-    32:65:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    66:66:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    66:66: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):381 -> a
-    66:66:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    67:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):383:408 -> a
-    67:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    93:94:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    93:94: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):410 -> a
-    93:94:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    95:96:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):410:411 -> a
-    95:96:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):133 -> a
-    97:98:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:138 -> a
-    99:99:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    99:99:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    100:102:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    103:110:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):148:155 -> a
-    111:121:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):423:433 -> a
-    111:121:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    122:122:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):432 -> a
-    122:122:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    123:140:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):438:455 -> a
-    123:140:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    141:142:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod() -> a
-    141:142:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457 -> a
-    141:142:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    143:144:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):457:458 -> a
-    143:144:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):159 -> a
-    145:147:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):163:165 -> a
-    148:148:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):164:164 -> a
-    149:157:boolean removeLambdaDeserializationMethods(java.lang.Iterable):173:181 -> a
-    158:158:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    158:158:boolean removeLambdaDeserializationMethods(java.lang.Iterable):181 -> a
-    159:161:boolean removeLambdaDeserializationMethods(java.lang.Iterable):182:184 -> a
-    162:168:void adjustAccessibility():200:206 -> a
-    169:169:void adjustAccessibility():205:205 -> a
-    170:171:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):215:216 -> a
-    172:181:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):222:231 -> a
-    182:182:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228:228 -> a
-    183:187:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):250:254 -> a
-    188:188:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):253:253 -> a
-    189:198:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):264:273 -> a
-    199:199:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
-    199:199:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):273 -> a
-    200:207:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):274:281 -> a
-    208:218:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296:306 -> a
-    208:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    219:219:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):305:305 -> a
-    219:219:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    220:220:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):304:304 -> a
-    220:220:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    221:221:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
-    221:221:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):284 -> a
-    222:222:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):288:288 -> a
-    223:223:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    223:223:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):288 -> a
-    224:224:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):288:288 -> a
-    225:225:boolean isInMainDexList(com.android.tools.r8.graph.DexType):258:258 -> a
-    225:225:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):289 -> a
-    226:226:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):290:290 -> a
-    227:229:java.lang.Object getKnown(java.util.Map,java.lang.Object):310:312 -> a
-    230:237:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):316:323 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):88:88 -> b
-    2:4:java.util.Set getDesugaredCallSites():236:238 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.w.d.A:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):94:94 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):76:105 -> <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):56:56 -> 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):56:56 -> a
+    3:18:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):110:125 -> a
+    19:19:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):123:123 -> a
+    20:37:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:161 -> a
+    38: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):368:379 -> a
+    38:49:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> 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):378 -> a
+    50:50:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    51:84: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):381:414 -> a
+    51:84:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    85:85:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    85:85: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):414 -> a
+    85:85:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    86:111: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):416:441 -> a
+    86:111:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    112:113:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    112:113: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):443 -> a
+    112:113:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    114: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):443:444 -> a
+    114:115:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):166 -> a
+    116:117:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170:171 -> a
+    118:118:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    118:118:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171 -> a
+    119:121:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171:173 -> a
+    122:129:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):181:188 -> a
+    130:140:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):456:466 -> a
+    130:140:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    141:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465 -> a
+    141:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    142:159:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):471:488 -> a
+    142:159:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    160:161:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    160:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490 -> a
+    160:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):490:491 -> a
+    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):192 -> a
+    164:166:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):196:198 -> a
+    167:167:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):197:197 -> a
+    168:176:boolean removeLambdaDeserializationMethods(java.lang.Iterable):206:214 -> a
+    177:177:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    177:177:boolean removeLambdaDeserializationMethods(java.lang.Iterable):214 -> a
+    178:180:boolean removeLambdaDeserializationMethods(java.lang.Iterable):215:217 -> a
+    181:187:void adjustAccessibility():233:239 -> a
+    188:188:void adjustAccessibility():238:238 -> a
+    189:190:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):248:249 -> a
+    191:200:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):255:264 -> a
+    201:201:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):261:261 -> a
+    202:206:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):283:287 -> a
+    207:207:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):286:286 -> a
+    208:217:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):297:306 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    218:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    219:226:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):307:314 -> a
+    227:237:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):329:339 -> a
+    227:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    238:238:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:338 -> a
+    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    239:239:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):337:337 -> a
+    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    240:240:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):335:335 -> a
+    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):317 -> a
+    241:241:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321:321 -> a
+    242:242:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    242:242:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    243:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321:321 -> a
+    244:244:boolean isInMainDexList(com.android.tools.r8.graph.DexType):291:291 -> a
+    244:244:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):322 -> a
+    245:245:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):323:323 -> a
+    246:248:java.lang.Object getKnown(java.util.Map,java.lang.Object):343:345 -> a
+    249:256:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):349:356 -> a
+    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
+    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.w.d.A:
+    com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> a
+    com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> c
+    com.android.tools.r8.graph.DexEncodedMethod val$method -> b
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod):125:125 -> <init>
+    1:4:void registerCallSite(com.android.tools.r8.graph.DexCallSite):129:132 -> registerCallSite
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.w.d.C:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> mapInvocationType
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.w.d.B:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.w.d.D:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -29502,15 +29701,15 @@
     60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1262 -> a
+    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1277 -> a
     68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1261:1264 -> a
+    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
     71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1260:1260 -> a
+    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
     76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
@@ -29526,7 +29725,7 @@
     1:1:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):114:114 -> d
     2:15:void processNest(java.util.List):125:138 -> d
     2:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.w.d.B$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.w.d.D$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
@@ -29545,7 +29744,7 @@
     2:2:boolean isGet():454:454 -> g
     2:2:boolean isStaticGet():470 -> g
     1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.w.d.C:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.w.d.E:
     com.android.tools.r8.graph.DexClass currentClass -> a
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> c
     com.android.tools.r8.graph.DexMethod context -> b
@@ -29577,7 +29776,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):365:365 -> registerInvokeVirtual
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):411:411 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.w.d.D:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.w.d.F:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
@@ -29593,66 +29792,67 @@
     1:16:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):115:130 -> lookupMethod
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> lookupPrototypeChanges
     1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):67:68 -> lookupPutFieldForMethod
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.w.d.E:
-    1:1:void <init>():18:18 -> <init>
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.w.d.G:
+    1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
-    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.w.d.E$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.w.d.G$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> e
     java.util.Set notRewritten -> a
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):41:41 -> <init>
-    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):36:48 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):54:54 -> <init>
+    2:14:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory):49:61 -> <init>
     boolean isRewriting() -> a
-    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):52:52 -> a
-    2:25:void validatePrefixes(java.util.Map):56:79 -> a
+    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):65:65 -> a
+    2:25:void validatePrefixes(java.util.Map):69:92 -> a
     26:26:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    26:26:void validatePrefixes(java.util.Map):79 -> a
+    26:26:void validatePrefixes(java.util.Map):92 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    27:27:void validatePrefixes(java.util.Map):79 -> a
-    28:28:void validatePrefixes(java.util.Map):79:79 -> a
-    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:109 -> a
-    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):88:92 -> b
-    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113:113 -> b
-    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    27:27:void validatePrefixes(java.util.Map):92 -> a
+    28:28:void validatePrefixes(java.util.Map):92:92 -> a
+    29:39:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:122 -> a
+    1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):101:105 -> b
+    6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126:126 -> b
+    6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     7:7:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):470 -> b
-    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     8:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):474:476 -> b
-    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):113 -> b
-    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114:114 -> b
-    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):124:127 -> b
-    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
+    8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127:127 -> b
+    11:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):137:140 -> b
+    12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     16:16:int com.android.tools.r8.graph.DexString.getArrayDim():481:481 -> b
     16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):448 -> b
-    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
+    16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     17:34:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):449:466 -> b
-    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):127 -> b
-    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):128:129 -> b
-    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):114 -> b
-    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):118:118 -> b
-    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):94 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.w.d.F:
-    1:1:void <init>():142:142 -> <init>
+    17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
+    17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    35:36:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):141:142 -> b
+    35:36:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
+    35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+    37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
+    37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.w.d.H:
+    1:1:void <init>():155:155 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.w.d.G:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.w.d.I:
     boolean $assertionsDisabled -> k
     java.util.Map lensGetFieldBridges -> i
     java.util.Map lensPutFieldBridges -> j
@@ -29662,7 +29862,7 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
@@ -29679,7 +29879,7 @@
     40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
     47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
     51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.w.d.M:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.w.d.O:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -29753,8 +29953,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.w.d.H:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.w.d.L:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.w.d.J:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.w.d.N:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -29774,7 +29974,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):961:961 -> 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):959:959 -> 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
@@ -29790,30 +29990,30 @@
     25:25:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     25:25:void desugar():352 -> a
     26:35:void desugar():356:365 -> a
-    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     36:36:void desugar():365 -> a
     37:38:void desugar():369:370 -> a
     39:69:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.w.d.I:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.w.d.K:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):423:424 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():429:429 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.w.d.J:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.w.d.L:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):406:407 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.w.d.K:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.w.d.M:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> 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):959:959 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.w.d.N:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.w.d.P:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -29828,7 +30028,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> j
     1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> k
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.w.d.O:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.w.d.Q:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -29919,11 +30119,11 @@
     628:670:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     671:704:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     705:705:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     706:706:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     707:723:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     724:728:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.w.d.P.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.w.d.R.a:
     1:25:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1565 -> A
     26:30:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
     31:31:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1560:1560 -> A
@@ -30407,7 +30607,7 @@
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1525:1525 -> z
     25:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1519:1536 -> z
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4815:4829 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.w.d.P.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.w.d.R.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:5:void rewriteLogicalAnd(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:24 -> a
@@ -30416,20 +30616,20 @@
     6:6:void rewriteLogicalOr(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):32:32 -> b
     1:5:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):38:42 -> c
     6:6:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):41:41 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.w.d.P.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.w.d.R.c:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.w.d.P.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.w.d.R.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:8:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     1:1:void rewriteSetOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):25:25 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.w.d.P.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.w.d.R.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:4:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
     5:6:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
@@ -30454,12 +30654,12 @@
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     1:6:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:24 -> c
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.w.d.P.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.w.d.R.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:25 -> a
     5:5:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):24:24 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.w.d.P.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.w.d.R.g:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void rewriteAsIdentity(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):33:36 -> a
@@ -30490,7 +30690,7 @@
     8:22:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):69:83 -> a
     23:32:void removeMarkedInstructions(java.util.Set):88:97 -> a
     33:34:void finish():105:106 -> a
-    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     35:35:void finish():106 -> a
     36:36:void finish():106:106 -> a
     1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
@@ -30521,42 +30721,49 @@
     java.util.Set revisitedMethods -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):57:64 -> <init>
-    1:6:void logResults():69:74 -> a
-    7:7:void logResults():73:73 -> a
-    8:44:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):82:118 -> a
-    45:51:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):117:123 -> a
-    52:69:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):131:148 -> a
-    70:89:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):155:174 -> a
-    90:90:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    90:90:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):178 -> a
-    91:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):179:189 -> a
-    102:102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    102:102:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):189 -> a
-    103:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):190:200 -> a
-    114:114:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    114:114:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):201 -> a
-    115:115:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203:203 -> a
-    116:116:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    116:116:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):203 -> a
-    117:117:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205:205 -> 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):961:961 -> a
-    118:118:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):204 -> a
-    119:140:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):206:227 -> a
-    141:141:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    141:141:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227 -> a
-    142:142:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227:227 -> a
-    143:169:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):235:261 -> a
-    170:178:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):260:268 -> a
-    179:179:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):263:263 -> a
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:175:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:265 -> a
+    176:184:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    185:185:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.d:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
-    1:5:void <clinit>():47:51 -> <clinit>
-    1:1:void <init>(java.lang.String,int):46:46 -> <init>
+    1:5:void <clinit>():48:52 -> <clinit>
+    1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.g:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30599,10 +30806,10 @@
     105:105:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
     106:122:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
     123:155:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
-    156:156:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    156:156:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     156:156:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     157:183:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     184:184:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     185:185:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
     186:186:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
@@ -30712,7 +30919,7 @@
     561:561:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     561:561:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1937 -> a
     562:564:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1941:1943 -> a
-    565:565:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    565:565:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     565:565:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1948 -> a
     566:583:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1949:1966 -> a
     584:584:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1965:1965 -> a
@@ -30761,115 +30968,113 @@
     924:938: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):3361:3375 -> a
     939:964:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3549:3574 -> a
     965:967:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3585:3587 -> a
-    968:970:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:99 -> a
+    968:970: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
     968:970:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3587 -> a
     971:972:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3588:3589 -> a
-    973:973:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3746 -> a
-    974:974:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    974:974:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3750 -> a
-    975:987:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3751:3763 -> a
-    988:988:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    988:988:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763 -> a
-    989:997:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3763:3771 -> a
-    998:998:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    998:998:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772 -> a
-    999:1006:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3772:3779 -> a
-    1007:1029:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3790:3812 -> a
-    1030:1030: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
-    1030:1030:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3812 -> a
-    1031:1031:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3813:3813 -> a
-    1032:1066:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3850:3884 -> a
-    1032:1066:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3817 -> a
-    1067:1089:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3818:3840 -> a
-    1090:1090:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    1090:1090:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3840 -> a
-    1091:1095:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3895:3899 -> a
-    1096:1096: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
-    1096:1096:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3899 -> a
-    1097:1101:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3900:3904 -> a
-    1102:1102:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3957:3957 -> a
-    1103:1107:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3963:3967 -> a
-    1103:1107:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1108:1108:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    1108:1108:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3967 -> a
-    1108:1108:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1109:1109:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3972:3972 -> a
-    1109:1109:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1110:1110:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1110:1110:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1111:1111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1111:1111:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969 -> a
-    1111:1111:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1112:1112:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3969:3969 -> a
-    1112:1112:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3959 -> a
-    1113:1114: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):3978:3979 -> a
-    1115:1115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1115:1115: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):3980 -> a
-    1116:1116: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):3982:3982 -> a
-    1117:1117:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    1117:1117: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):3982 -> a
-    1118:1119: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):3982:3983 -> a
-    1120:1140:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3993:4013 -> a
-    1141:1141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1141:1141:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4012 -> a
-    1142:1148:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4015:4021 -> a
-    1149:1187:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4019:4057 -> a
-    1188:1191: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):1321:1324 -> a
-    1188:1191:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4057 -> a
-    1192:1214:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4058:4080 -> a
-    1215:1215:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    1215:1215:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4080 -> a
-    1216:1217:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081:4082 -> a
-    1218:1233:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4081:4096 -> a
-    1234:1241:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4100:4107 -> a
-    1242:1252:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4120:4130 -> a
-    1242:1252:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1253:1253:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108:4108 -> a
-    1254:1279:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4153:4178 -> a
-    1254:1279:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4108 -> a
-    1280:1284:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4109:4113 -> a
-    1285:1285:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1286:1286:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1286:1286:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1287:1287:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1287:1287:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1287:1287:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110 -> a
-    1288:1288:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4110:4110 -> a
-    1289:1289:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1289:1289:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1290:1290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1290:1290:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1290:1290:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1291:1291:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1291:1291:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1291:1291:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128 -> a
-    1291:1291:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1292:1292:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4128:4128 -> a
-    1292:1292:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1293:1293:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1293:1293:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1294:1294:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1294:1294:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1294:1294:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1295:1295:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1295:1295:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1295:1295:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124 -> a
-    1295:1295:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1296:1296:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4124:4124 -> a
-    1296:1296:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4107 -> a
-    1297:1303:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4134:4140 -> a
+    973:993:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3746:3766 -> a
+    994:994:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    994:994:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766 -> a
+    995:1011:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3766:3782 -> a
+    1012:1012:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3781:3781 -> a
+    1013:1013:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1013:1013:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780 -> a
+    1014:1025:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3780:3791 -> a
+    1026:1048:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3802:3824 -> a
+    1049:1049: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
+    1049:1049:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3824 -> a
+    1050:1050:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3825:3825 -> a
+    1051:1085:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3862:3896 -> a
+    1051:1085:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3829 -> a
+    1086:1108:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3830:3852 -> a
+    1109:1109:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    1109:1109:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3852 -> a
+    1110:1114:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3907:3911 -> a
+    1115:1115: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
+    1115:1115:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3911 -> a
+    1116:1120:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3912:3916 -> a
+    1121:1121:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3969:3969 -> a
+    1122:1126:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3975:3979 -> a
+    1122:1126:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1127:1127:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    1127:1127:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3979 -> a
+    1127:1127:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1128:1128:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3984:3984 -> a
+    1128:1128:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1129:1129:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1129:1129:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1130:1130:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1130:1130:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981 -> a
+    1130:1130:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1131:1131:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3981:3981 -> a
+    1131:1131:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3971 -> a
+    1132:1133: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):3990:3991 -> a
+    1134:1134:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1134:1134: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):3992 -> a
+    1135:1135: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):3994:3994 -> a
+    1136:1136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1136:1136: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):3994 -> a
+    1137:1138: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):3994:3995 -> a
+    1139:1159:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4005:4025 -> a
+    1160:1160:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1160:1160:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4024 -> a
+    1161:1167:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4027:4033 -> a
+    1168:1206:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4031:4069 -> a
+    1207:1210: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):1356:1359 -> a
+    1207:1210:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4069 -> a
+    1211:1233:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4070:4092 -> a
+    1234:1234:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    1234:1234:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4092 -> a
+    1235:1236:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093:4094 -> a
+    1237:1252:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):4093:4108 -> a
+    1253:1260:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4112:4119 -> a
+    1261:1271:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4132:4142 -> a
+    1261:1271:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1272:1272:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120:4120 -> a
+    1273:1298:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):4165:4190 -> a
+    1273:1298:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4120 -> a
+    1299:1303:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4121:4125 -> a
+    1304:1304:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1305:1305:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1305:1305:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1306:1306:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1306:1306:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1306:1306:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122 -> a
+    1307:1307:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4122:4122 -> a
+    1308:1308:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1308:1308:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1309:1309:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1309:1309:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1309:1309:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1310:1310:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1310:1310:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1310:1310:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140 -> a
+    1310:1310:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1311:1311:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4140:4140 -> a
+    1311:1311:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1312:1312:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1312:1312:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1313:1313:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1313:1313:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1313:1313:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1314:1314:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1314:1314:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1314:1314:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136 -> a
+    1314:1314:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1315:1315:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):4136:4136 -> a
+    1315:1315:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):4119 -> a
+    1316:1322:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):4146:4152 -> a
     1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):316:317 -> b
     3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356:365 -> b
     13:13:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1098:1098 -> b
     14:53:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1160:1199 -> b
     54:54:boolean lambda$shortenLiveRanges$8(com.android.tools.r8.ir.code.ConstInstruction):2376:2376 -> b
     55:101:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3386:3432 -> b
-    102:103:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):985:986 -> b
+    102:103:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):983:984 -> b
     102:103:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3432 -> b
     104:115:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3433:3444 -> b
-    116:116:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4002:4002 -> b
-    117:119:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4243 -> b
-    120:120:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4241:4241 -> b
+    116:116:boolean lambda$logArgumentTypes$14(com.android.tools.r8.ir.code.Instruction):4014:4014 -> b
+    117:119:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4255 -> b
+    120:120:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$15():4253:4253 -> b
     1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1307:1323 -> c
     18:94:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):1369:1445 -> c
     18:94:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1323 -> c
@@ -30904,16 +31109,16 @@
     206:206:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3256:3256 -> c
     207:226:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3255:3274 -> c
     1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):183:183 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> d
     2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):185 -> d
     3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):187:209 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> d
     26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):221 -> d
     27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):224:225 -> d
-    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> d
+    29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
     29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225 -> d
     30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):225:228 -> d
-    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> d
+    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> d
     34:34:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):185 -> d
     1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1065:1070 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
@@ -30927,15 +31132,15 @@
     67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1093 -> e
     68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1096:1104 -> e
     1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1978:2004 -> f
-    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> f
+    28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
     28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2004 -> f
     29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2005:2005 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> f
     30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2006 -> f
     31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2008:2013 -> f
     37:53:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2042:2058 -> f
     37:53:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    54:54:boolean com.android.tools.r8.graph.DexType.isFloatType():213:213 -> f
+    54:54:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
     54:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2058 -> f
     54:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     55:92:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2059:2096 -> f
@@ -30947,18 +31152,18 @@
     94:96:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
     97:119:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2014:2036 -> f
     1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3640:3640 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> g
     2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3644 -> g
     3:65:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3645:3707 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> h
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> h
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3711 -> h
     2:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3712:3742 -> h
     1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791:1791 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> i
     2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1791 -> i
     3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1794:1827 -> i
     37:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1826:1880 -> i
-    92:92:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> i
+    92:92:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
     92:92:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880 -> i
     93:95:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1880:1882 -> i
     1:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):859:872 -> j
@@ -30998,7 +31203,7 @@
     224:224:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
     225:249:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):988:1012 -> j
     1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:312 -> k
-    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3914:3953 -> l
+    1:40:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3926:3965 -> l
     1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2353:2407 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
@@ -31007,7 +31212,7 @@
     58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2409:2411 -> m
     61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2396:2422 -> m
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652:2652 -> n
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> n
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2652 -> n
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2655:2663 -> n
     12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2628:2644 -> n
@@ -31029,7 +31234,7 @@
     1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3011:3016 -> p
     7:21:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3619:3633 -> p
     7:21:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3017 -> p
-    22:24:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:99 -> p
+    22:24:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
     22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3634 -> p
     22:24:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3017 -> p
     25:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3635:3635 -> p
@@ -31053,12 +31258,12 @@
     55:55:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
     56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604:3604 -> p
     56:56:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    57:59:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:99 -> p
+    57:59:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
     57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3605 -> p
     57:59:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
     60:64:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3606:3610 -> p
     60:64:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    65:67:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:99 -> p
+    65:67:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
     65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3611 -> p
     65:67:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
     68:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3612:3612 -> p
@@ -31070,7 +31275,7 @@
     72:72:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     73:107:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3481:3515 -> p
     73:107:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> p
+    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> p
     108:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3516 -> p
     108:108:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
     109:130:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3518:3539 -> p
@@ -31100,13 +31305,13 @@
     212:212:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
     212:212:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3122 -> p
     213:215:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3128:3130 -> p
-    216:216:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> p
+    216:216:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
     216:216:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130 -> p
     217:219:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3130:3132 -> p
     1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2209:2238 -> q
     1:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2249:2274 -> r
     27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2262:2280 -> r
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4240:4285 -> s
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4252:4297 -> s
     1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1117:1131 -> t
     16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):371:389 -> t
     16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1132 -> t
@@ -31164,7 +31369,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):548:548 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):558:558 -> a
     4:15:com.android.tools.r8.ir.code.BasicBlock build():563:574 -> a
-    16:19: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):1321:1324 -> a
+    16:19: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):1356:1359 -> a
     16:19:com.android.tools.r8.ir.code.BasicBlock build():574 -> a
     20:22:com.android.tools.r8.ir.code.BasicBlock build():576:578 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):553:553 -> b
@@ -31223,11 +31428,11 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():4185:4185 -> <clinit>
-    1:8:void <init>():4185:4192 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4185:4185 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4195:4197 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):4201:4233 -> b
+    1:1:void <clinit>():4197:4197 -> <clinit>
+    1:8:void <init>():4197:4204 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):4197:4197 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):4207:4209 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):4213:4245 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.h$j:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
@@ -31238,7 +31443,7 @@
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):485:485 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):490:490 -> a
     4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):496:517 -> 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):1351:1354 -> 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):1386:1389 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):517 -> a
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):518:519 -> 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):508:508 -> a
@@ -31321,139 +31526,83 @@
     40:59:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):122:141 -> b
 com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.l:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
+    boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.IRCode code -> d
-    int inliningInstructionLimit -> h
+    int instructionAllowance -> h
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
-    int instructionAllowance -> i
+    int inliningInstructionLimit -> g
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
-    com.android.tools.r8.ir.optimize.InliningInfo info -> g
     java.util.function.Predicate isProcessedConcurrently -> f
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):59:68 -> <init>
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.Predicate,int,int):65:73 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    1:3:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):79:81 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):82 -> a
-    5:15:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):82:92 -> a
-    16:16:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):93 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):83:83 -> a
-    18:18:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod validateCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod):84 -> a
-    19:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):101:124 -> a
-    43:44:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):104:105 -> a
-    45:49: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):139:143 -> a
+    boolean isForcedInliningOracle() -> a
+    1:6:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):89:94 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    7:7:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94 -> a
+    8:17:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:103 -> a
+    18:18:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):86:86 -> a
+    19:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):111:134 -> a
+    43:44:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
+    45:49: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):150:154 -> a
     50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    50:50: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):143 -> a
-    51:61:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):144:154 -> a
-    62:82: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):150:170 -> a
+    50:50: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):154 -> a
+    51:61:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):155:165 -> a
+    62:82: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):161:181 -> a
     83:83:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    83:83: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):170 -> a
-    84:84: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):152:152 -> a
-    85:92:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):181:188 -> a
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    93:93:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188 -> a
-    94:103:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):188:197 -> a
-    104:104:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    104:104:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):198 -> a
-    105:106:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):208:209 -> a
-    107:107:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    107:107:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):210 -> a
-    108:122:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):215:229 -> a
-    123:123:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    123:123:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):230 -> a
-    124:124:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235:235 -> a
-    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    125:125:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):235 -> a
-    126:129:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):237:240 -> a
-    130:130:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    130:130:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):241 -> a
-    131:137:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):246:252 -> a
-    138:138:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    138:138:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):253 -> a
-    139:148:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):258:267 -> a
-    149:149:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    149:149:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):268 -> a
-    150:160:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):273:283 -> a
-    161:163:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):282:284 -> a
-    164:164:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    164:164:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason):285 -> a
-    165:165:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    166:177:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):315:326 -> a
-    166:177:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):299 -> a
-    178:185:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):300:307 -> a
-    186:186:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):304:304 -> a
-    187:195:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):338:346 -> a
-    196:196:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    196:196:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):347 -> a
-    197:202:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):352:357 -> a
-    203:203:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    203:203:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):357 -> a
-    204:205:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):360:361 -> a
-    206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    206:206:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):361 -> a
-    207:210:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):365:368 -> a
-    211:211:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    211:211:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368 -> a
-    212:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):368:380 -> a
-    225:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):379:388 -> a
-    235:241:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):384:390 -> a
-    242:251:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):402:411 -> a
-    252:252:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    252:252:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    253:253:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    253:253:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    253:253:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    254:254:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    254:254:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):412 -> a
-    255:256:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):418:419 -> a
-    257:257:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    257:257:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    258:258:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    258:258:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    258:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    259:259:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    259:259:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):420 -> a
-    260:264:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):425:429 -> a
-    265:265:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokeStatic.getType():57:57 -> a
-    265:265:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    266:266:void com.android.tools.r8.ir.optimize.InliningInfo.include(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    266:266:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):430 -> a
-    267:267:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):432:432 -> a
-    268:268:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):439:439 -> a
-    269:269:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    269:269:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    270:270:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.ir.code.InvokePolymorphic.getType():51:51 -> a
-    270:270:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81 -> a
-    270:270:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    271:271:void com.android.tools.r8.ir.optimize.InliningInfo.exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    271:271:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod):440 -> a
-    272:274:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):448:450 -> a
-    275:275:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    275:275:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):450 -> a
-    276:276:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
-    277:277:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):460:460 -> a
-    278:336:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:723 -> a
-    278:336:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    337:337:boolean com.android.tools.r8.ir.optimize.Inliner.legalConstructorInline(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):665:665 -> a
-    337:337:boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy):461 -> a
-    338:338:boolean stillHasBudget():466:466 -> a
-    339:339:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471:471 -> a
-    340:340:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    340:340:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    341:360:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):475:494 -> a
-    361:362:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1477:1478 -> a
-    361:362:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):495 -> a
-    363:372:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):501:510 -> a
-    373:373:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    373:373:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock):471 -> a
-    374:374:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):516:516 -> a
-    375:399:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):522:546 -> a
-    400:407:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):558:565 -> a
-    1:2:void finish():73:74 -> b
-    3:4:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> b
+    83:83: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):181 -> a
+    84:84: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):185:185 -> a
+    85:85:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    85:85: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):181 -> a
+    86:86: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):163:163 -> a
+    87:95: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):200:208 -> a
+    96:96:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    96:96: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):208 -> a
+    97:141: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):208:252 -> a
+    142:142:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    142:142:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):252 -> a
+    143: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):254:296 -> a
+    186:188: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):295:297 -> a
+    189:189:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
+    190:201:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:329 -> a
+    190:201:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):310 -> a
+    202:202:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    203:203:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):340:340 -> a
+    204:214:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):349:359 -> a
+    215:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):358:368 -> a
+    226:226:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    226:226:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):368 -> a
+    227:233:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370:376 -> a
+    234:234:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    234:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376 -> a
+    235:246:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):376:387 -> a
+    247:258:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):400:411 -> a
+    259:274:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:425 -> a
+    275:277:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):431:433 -> a
+    278:278:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    278:278:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):433 -> a
+    279:279:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):435:435 -> a
+    280:371:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):453:544 -> a
+    372:372:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551:551 -> a
+    373:373:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    373:373:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    374:376:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):554:556 -> a
+    377:377:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    377:377:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):551 -> a
+    378:378:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566:566 -> a
+    379:379:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    379:379:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    380:399:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):570:589 -> a
+    400:401:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1512:1513 -> a
+    400:401:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):590 -> a
+    402:416:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):596:610 -> a
+    417:417:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():550:550 -> a
+    417:417:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):566 -> a
+    418:418:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):621:621 -> a
+    419:443:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):627:651 -> a
+    444:451:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):663:670 -> a
+    1:2:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):191:192 -> b
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.m:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -31471,14 +31620,14 @@
     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):961:961 -> 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):959:959 -> 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
     153:153:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):198 -> a
     154:169:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):200:215 -> a
     170:181:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):214:225 -> a
-    182:182:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    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.n:
@@ -31491,8 +31640,8 @@
     4:76:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
     77:82:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):125:130 -> a
     77:82:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    83:98:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):154:169 -> a
-    1:9:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:149 -> b
+    83:98:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.o:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31503,23 +31652,24 @@
     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.p:
-    java.util.Map invokesToInline -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):30:32 -> <init>
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
+    java.util.Map invokesToInline -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):35:38 -> <init>
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
+    boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod):42:42 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):50:50 -> a
-    3:6:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):105:108 -> a
-    void finish() -> b
-    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):54:64 -> b
+    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):48:52 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):61:61 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):71:71 -> a
+    8:11:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):124:127 -> a
+    1:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):75:85 -> b
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.r:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31570,69 +31720,70 @@
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
 com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.ir.optimize.Inliner:
-    java.util.Set blackList -> g
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
-    java.util.Set doubleInlineCallers -> d
-    java.util.Set doubleInlineSelectedTargets -> e
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> h
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
-    java.util.Map doubleInlineeCandidates -> f
-    boolean applyDoubleInlining -> c
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):62:77 -> <init>
-    1:2:void fillInBlackList():81:82 -> a
-    3:6:boolean isBlackListed(com.android.tools.r8.graph.DexMethod):86:89 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
-    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    10:15:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):890:895 -> a
-    10:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    16:16:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):895 -> a
-    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    17:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):105:117 -> a
-    30:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):95:97 -> a
-    30:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):118 -> a
-    33:38:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):119:124 -> a
-    39:43:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):146:150 -> a
-    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    44:44:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
-    45:45:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):151:151 -> a
-    46:53:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):155:162 -> a
-    54:54:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    54:54:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):162 -> a
-    55:55:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    55:55:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):165 -> a
-    56:57:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> a
-    58:65:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:213 -> a
-    66:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):212:225 -> a
-    80:84:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:219 -> a
-    85:91:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:221 -> a
-    92:116:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):619:643 -> a
-    117:118:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):746:747 -> a
-    119:127:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):756:764 -> a
-    128:128:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    128:128:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):758 -> a
-    129:129:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):765:765 -> a
-    130:130:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):775:775 -> a
-    131:149:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):792:810 -> a
-    150:150:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():529:529 -> a
-    150:150:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):810 -> a
-    151:159:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:821 -> a
-    160:192:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819:851 -> a
-    193:202:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):905:914 -> a
-    193:202:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):857 -> a
-    203:238:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):851:886 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):130:136 -> b
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
+    java.util.Set blackList -> b
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):74:74 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):66:79 -> <init>
+    1:23:boolean isBlackListed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):84:106 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1423:1423 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    27:32:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):861:866 -> a
+    27:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    33:33:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):866 -> a
+    33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):125 -> a
+    34:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):126:138 -> a
+    47:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):116:118 -> a
+    47:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):139 -> a
+    50:55:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):140:145 -> a
+    56:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):167:171 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    61:61:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):171 -> a
+    62:62:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):172:172 -> a
+    63:70:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):176:183 -> a
+    71:71:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    71:71:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):183 -> a
+    72:72:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    72:72:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):186 -> a
+    73:74:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):191:192 -> a
+    75:82:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):227:234 -> a
+    83:96:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):233:246 -> a
+    97:101:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:240 -> a
+    102:108:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:242 -> a
+    109:133:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):640:664 -> a
+    134:135:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):689:690 -> a
+    136:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):699:707 -> a
+    145:145:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    145:145:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):701 -> a
+    146:146:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):708:708 -> a
+    147:147:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):718:718 -> a
+    148:191:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):735:778 -> a
+    192:199:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):849:856 -> a
+    192:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    200:200:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):854:854 -> a
+    200:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783 -> a
+    201:201:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):783:783 -> a
+    202:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):779:813 -> a
+    237:246:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):876:885 -> a
+    237:246:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):819 -> a
+    247:279:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):813:845 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:157 -> b
     8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):188:199 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):176:182 -> c
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):209:220 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):197:203 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.Inliner$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -31643,89 +31794,89 @@
     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>():235:251 -> <clinit>
-    18:47:void <clinit>():235:264 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):255:256 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():235:235 -> a
-    1:1:boolean isSet(int):268:268 -> b
+    1:17:void <clinit>():256:272 -> <clinit>
+    18:47:void <clinit>():256:285 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):276:277 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():256:256 -> a
+    1:1:boolean isSet(int):289:289 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     com.android.tools.r8.graph.DexType targetHolder -> b
     boolean $assertionsDisabled -> c
-    1:9:void <clinit>():286:294 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):296:299 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):302:306 -> <init>
-    1:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):329:331 -> a
+    1:9:void <clinit>():307:315 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):317:320 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):323:327 -> <init>
+    1:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):350:352 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):332 -> a
-    5:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):333:341 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):342 -> a
-    15:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):344:348 -> a
-    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):82:82 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):351 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):352:352 -> a
-    22:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):358:363 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):353 -> a
+    5:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):354:362 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):363 -> a
+    15:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):365:369 -> a
+    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):372 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):373:373 -> a
+    22:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):379:384 -> a
     28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):366 -> a
-    29:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):368:369 -> a
-    1:5:boolean equals(java.lang.Object):319:323 -> equals
-    1:4:int hashCode():311:314 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():40:40 -> hashCode
-    5:5:int hashCode():314 -> hashCode
-    1:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):374:424 -> meet
-    52:52:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):498:498 -> meet
-    52:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> meet
+    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):387 -> a
+    29:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):389:390 -> a
+    1:5:boolean equals(java.lang.Object):340:344 -> equals
+    1:4:int hashCode():332:335 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
+    5:5:int hashCode():335 -> hashCode
+    1:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):395:445 -> meet
+    52:52:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):519:519 -> meet
+    52:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> meet
     53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):499 -> meet
-    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> meet
-    54:59:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):500:505 -> meet
-    54:59:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> meet
+    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):520 -> meet
+    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> meet
+    54:59:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):521:526 -> meet
+    54:59:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> meet
     60:60:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):505 -> meet
-    60:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> meet
-    61:63:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):506:508 -> meet
-    61:63:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):424 -> meet
-    64:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):425:432 -> meet
+    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):526 -> meet
+    60:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> meet
+    61:63:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):527:529 -> meet
+    61:63:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):445 -> meet
+    64:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):446:453 -> meet
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):475 -> meet
-    72:72:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> meet
-    73:80:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):477:484 -> meet
-    73:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> meet
+    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):496 -> meet
+    72:72:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> meet
+    73:80:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):498:505 -> meet
+    73:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> meet
     81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):484 -> meet
-    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> meet
-    82:86:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):486:490 -> meet
-    82:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):432 -> meet
-    87:121:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):436:470 -> meet
+    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):505 -> meet
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> meet
+    82:86:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507:511 -> meet
+    82:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):453 -> meet
+    87:121:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:491 -> meet
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.Inliner$b:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():533:533 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):541:544 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():548:548 -> a
-    2:30:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):557:585 -> a
-    31:33:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):97:99 -> a
-    31:33:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):586 -> a
-    34:49:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):587:602 -> a
+    1:1:void <clinit>():554:554 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):562:565 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():569:569 -> a
+    2:30:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):578:606 -> a
+    31:33: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
+    31:33:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):607 -> a
+    34:49:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):608:623 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.s:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):611:613 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.t:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):735:737 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.Inliner$c:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():521:525 -> <clinit>
-    1:1:void <init>(java.lang.String,int):520:520 -> <init>
+    1:5:void <clinit>():542:546 -> <clinit>
+    1:1:void <init>(java.lang.String,int):541:541 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -31792,44 +31943,20 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):224:224 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> g
-com.android.tools.r8.ir.optimize.InliningInfo -> com.android.tools.r8.ir.optimize.z:
-    java.util.List edges -> b
-    com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexEncodedMethod):70:73 -> <init>
-    1:1:void exclude(com.android.tools.r8.ir.code.InvokeMethod,java.lang.String):81:81 -> a
-    1:4:java.lang.String toString():86:89 -> toString
-    5:9:void com.android.tools.r8.ir.optimize.InliningInfo$Edge.appendOn(java.lang.StringBuffer):29:33 -> toString
-    5:9:java.lang.String toString():90 -> toString
-    10:13:java.lang.String toString():91:94 -> toString
-com.android.tools.r8.ir.optimize.InliningInfo$Edge -> com.android.tools.r8.ir.optimize.v:
-    com.android.tools.r8.ir.optimize.InliningInfo$Node inlinee -> b
-    com.android.tools.r8.graph.DexMethod declared -> a
-    1:4:void <init>(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.InliningInfo$Node):22:25 -> <init>
-com.android.tools.r8.ir.optimize.InliningInfo$Inlining -> com.android.tools.r8.ir.optimize.w:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> <init>
-    1:1:void appendOn(java.lang.StringBuffer):50:50 -> a
-com.android.tools.r8.ir.optimize.InliningInfo$Node -> com.android.tools.r8.ir.optimize.x:
-    1:1:void <init>():37:37 -> <init>
-    void appendOn(java.lang.StringBuffer) -> a
-com.android.tools.r8.ir.optimize.InliningInfo$NotInlining -> com.android.tools.r8.ir.optimize.y:
-    java.lang.String reason -> a
-    1:2:void <init>(java.lang.String):58:59 -> <init>
-    1:2:void appendOn(java.lang.StringBuffer):64:65 -> a
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.A:
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokePolymorphic(com.android.tools.r8.ir.code.InvokePolymorphic,com.android.tools.r8.graph.DexMethod) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis) -> a
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod) -> a
-    void finish() -> b
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.B:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.v:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,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
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.w:
+    boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
-    boolean isValidTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ClassHierarchy) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean stillHasBudget() -> a
+    boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> a
-    boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.C:
+    boolean willExceedBudget(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.x:
     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
@@ -31837,7 +31964,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.y:
     java.util.Map memberPools -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
@@ -31899,7 +32026,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):234:234 -> 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.y$a:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -31928,7 +32055,7 @@
     3:3:boolean hasSeenStrictlyAbove(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):209:209 -> 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.B:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -31985,22 +32112,22 @@
     273:293: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):388:408 -> a
     273:293:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
     294:295:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):446:447 -> a
-    296:296:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    296:296:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     296:296:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447 -> a
     297:299:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:449 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.E:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.z:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):64:66 -> <init>
     1:5:boolean equals(java.lang.Object):71:75 -> equals
     1:1:int hashCode():80:80 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.F:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.A:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():54:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.H:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.C:
     java.util.function.Predicate methodTester -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):37:38 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):43:44 -> <init>
@@ -32017,7 +32144,7 @@
     21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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.D:
     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>
@@ -32025,7 +32152,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.E:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -32063,11 +32190,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.F:
     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():881:881 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     16:16:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47 -> a
@@ -32081,7 +32208,7 @@
     45:45:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):72 -> a
     46:52:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):73:79 -> a
     53:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.L:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.G:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
@@ -32109,7 +32236,7 @@
     99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):157:158 -> a
     101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):157:231 -> a
     176:196:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):229:249 -> a
-    197:197:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    197:197:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     197:197:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249 -> a
     198:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):249:249 -> a
     199:259:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):303:363 -> a
@@ -32123,7 +32250,7 @@
     331:376:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):471:516 -> a
     331:376:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):450 -> a
     377:382:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):456:461 -> 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.L:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -32132,32 +32259,32 @@
     java.util.Set methodsSelectedForOutlining -> b
     com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
     1:1:void <clinit>():106:106 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1262:1262 -> <init>
-    2:1157:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1264 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):1273:1273 -> <init>
+    2:1168:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:1275 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):106:106 -> a
-    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1275:1277 -> a
-    5:10:java.util.List selectOutlines():1369:1374 -> a
-    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1312 -> a
-    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1313:1321 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):579:579 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1322 -> a
-    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323:1332 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1332 -> a
-    32:63:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333:1364 -> a
-    64:70:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1381:1387 -> a
-    71:72:boolean checkAllOutlineSitesFoundAgain():1392:1393 -> a
+    2:4:void lambda$identifyCandidateMethods$0(java.util.Map,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1286:1288 -> a
+    5:10:java.util.List selectOutlines():1380:1385 -> a
+    5:10:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1323 -> a
+    11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1324:1332 -> a
+    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
+    20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
+    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
+    32:63:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1375 -> a
+    64:70:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
+    71:72:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):106:106 -> b
-    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1283:1285 -> b
-    5:5:java.util.Set getMethodsSelectedForOutlining():1305:1305 -> b
+    2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1294:1296 -> b
+    5:5:java.util.Set getMethodsSelectedForOutlining():1316:1316 -> b
     void noProcessing(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> c
     1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):106:106 -> c
-    2:4:java.util.function.BiConsumer identifyCandidateMethods():1272:1274 -> c
+    2:4:java.util.function.BiConsumer identifyCandidateMethods():1283:1285 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):106:106 -> d
-    2:8:boolean selectMethodsForOutlining():1290:1296 -> d
-    9:15:boolean selectMethodsForOutlining():1295:1301 -> d
+    2:8:boolean selectMethodsForOutlining():1301:1307 -> d
+    9:15:boolean selectMethodsForOutlining():1306:1312 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):106:106 -> 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.H:
     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):209:210 -> <init>
     java.lang.String getDetailsString() -> a
@@ -32167,11 +32294,11 @@
     5:5:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):236 -> a
     6:11:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):238:243 -> a
     12:16:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):268:272 -> a
-    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    17:17:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     17:17:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):274 -> a
     18:19:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:277 -> a
     20:23:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):276:279 -> a
-    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    24:24:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     24:24:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281 -> a
     25:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):281:300 -> a
     45:45:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):297:297 -> a
@@ -32185,7 +32312,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():221 -> hashCode
     2:2:int hashCode():221:221 -> 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.I:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -32201,12 +32328,12 @@
     14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):433:452 -> a
     34:34:java.lang.String getDetailsString():458:458 -> a
     35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):487:489 -> a
-    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):491 -> a
     39:44:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):477:482 -> a
     39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493 -> a
     45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):493:498 -> a
-    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500 -> a
     52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):500:503 -> a
     56:56:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
@@ -32219,7 +32346,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():409 -> hashCode
     2:6:int hashCode():409:413 -> 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.J:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):311:312 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):332:332 -> a
@@ -32228,7 +32355,7 @@
     3:4:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):335:336 -> a
     5:5:java.lang.String getDetailsString():341:341 -> a
     6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):361:362 -> a
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
     8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364 -> a
     9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364:366 -> a
     1:1:java.lang.String getInstructionName():346:346 -> b
@@ -32238,7 +32365,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():181:181 -> hashCode
     1:1:int hashCode():327 -> hashCode
     2:2:int hashCode():327:327 -> 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.K:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -32248,33 +32375,33 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():531:531 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):548:548 -> <init>
-    2:27:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:560 -> <init>
-    28:28:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
-    1:5:com.android.tools.r8.graph.DexProto buildProto():570:574 -> a
+    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):535:562 -> <init>
+    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):556:556 -> <init>
+    1:5:com.android.tools.r8.graph.DexProto buildProto():572:576 -> a
     1:1:int compareTo(java.lang.Object):531:531 -> compareTo
-    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):627:632 -> compareTo
+    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):629:634 -> compareTo
     2:7:int compareTo(java.lang.Object):531 -> compareTo
-    8:8:int argumentCount():566:566 -> compareTo
-    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632 -> compareTo
+    8:8:int argumentCount():568:568 -> compareTo
+    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634 -> compareTo
     8:8:int compareTo(java.lang.Object):531 -> compareTo
-    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632:663 -> compareTo
+    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):634:665 -> compareTo
     9:40:int compareTo(java.lang.Object):531 -> compareTo
-    1:18:boolean equals(java.lang.Object):584:601 -> equals
-    1:6:int hashCode():609:614 -> hashCode
-    1:37:java.lang.String toString():670:706 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.Q$a:
+    1:18:boolean equals(java.lang.Object):586:603 -> equals
+    1:6:int hashCode():611:616 -> hashCode
+    1:37:java.lang.String toString():672:708 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.L$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):1555:1556 -> <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):1582:1583 -> buildIR
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1566:1567 -> <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):1593:1594 -> 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):1583 -> 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):1583:1583 -> buildIR
-    1:1:boolean computeEquals(java.lang.Object):1603:1603 -> computeEquals
-    1:1:int computeHashCode():1598:1598 -> computeHashCode
-    1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1593:1593 -> registerCodeReferences
-    1:1:java.lang.String toString():1588:1588 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.T:
+    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):1594 -> 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):1594:1594 -> buildIR
+    1:1:boolean computeEquals(java.lang.Object):1614:1614 -> computeEquals
+    1:1:int computeHashCode():1609:1609 -> computeHashCode
+    1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1604:1604 -> registerCodeReferences
+    1:1:java.lang.String toString():1599:1599 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.N:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():122:122 -> <clinit>
@@ -32286,7 +32413,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.M:
     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
@@ -32299,60 +32426,60 @@
     8:8:void <clinit>():127:127 -> <clinit>
     1:1:void <init>(java.lang.String,int):127:127 -> <init>
     1:22:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType fromInstruction(com.android.tools.r8.ir.code.Instruction):137:158 -> a
-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.O:
     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):1137:1139 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1144:1146 -> a
-    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1150:1151 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.V:
+    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):1148:1150 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1155:1157 -> a
+    4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1161:1162 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.P:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.optimize.Outliner this$0 -> u
     int argumentsMapIndex -> t
-    1:1:void <clinit>():1171:1171 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1180:1184 -> <init>
-    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1189:1248 -> a
-    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1255:1257 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.W:
+    1:1:void <clinit>():1182:1182 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1191:1195 -> <init>
+    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1259 -> a
+    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.Q:
     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):1158:1159 -> <init>
-    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1164:1166 -> a
-    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1165:1165 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.X:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1169:1170 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1175:1177 -> a
+    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1176:1176 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.S:
     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 <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1408:1408 -> <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):1406:1410 -> <init>
+    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):1419:1419 -> <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):1417:1421 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():1415:1415 -> a
-    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1446:1446 -> a
-    3:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1460:1469 -> a
-    13:13:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1475:1475 -> a
-    14:18:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1486:1490 -> a
-    19:19:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():566:566 -> a
-    19:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490 -> a
-    20:29:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1490:1499 -> a
-    30:30:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1505:1505 -> a
-    31:31:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1511:1511 -> a
-    32:32:int getMoveExceptionRegister(int):1521:1521 -> a
+    1:1:int instructionCount():1426:1426 -> a
+    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1457:1457 -> a
+    3:12:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1471:1480 -> a
+    13:13:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1486:1486 -> a
+    14:18:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1497:1501 -> a
+    19:19:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():568:568 -> a
+    19:19:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501 -> a
+    20:29:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1501:1510 -> a
+    30:30:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1516:1516 -> a
+    31:31:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1522:1522 -> a
+    32:32:int getMoveExceptionRegister(int):1532:1532 -> 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):1526:1526 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1531:1531 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1537:1537 -> d
+    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1542:1542 -> 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.T:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -32369,54 +32496,51 @@
     java.util.List arguments -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.optimize.Outliner this$0 -> o
-    1:1:void <clinit>():714:714 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):733:733 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):719:736 -> <init>
+    1:1:void <clinit>():716:716 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):735:735 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):721:738 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline) -> a
-    1:4:java.util.List getInstructionArray():740:743 -> a
-    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):765:770 -> a
-    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):910:922 -> a
-    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):927:933 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
-    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):933 -> a
-    32:32:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):937:937 -> a
-    33:35:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement.getArrayBaseTypeLattice():70:72 -> a
-    33:35:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):938 -> a
-    36:40:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):939:943 -> a
-    41:73:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):949:981 -> a
-    74:81:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1059:1066 -> a
-    82:117:void candidate(int,int):1074:1109 -> a
-    118:128:void reset(int):1114:1124 -> a
-    1:1:void invalidateInstructionArray():748:748 -> b
-    1:5:void process():754:758 -> c
-    6:9:void processInstruction(com.android.tools.r8.ir.code.Instruction):781:784 -> c
-    6:9:void process():758 -> c
-    10:96:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):818:904 -> c
-    10:96:void processInstruction(com.android.tools.r8.ir.code.Instruction):792 -> c
-    10:96:void process():758 -> c
-    97:97:void processInstruction(com.android.tools.r8.ir.code.Instruction):796:796 -> c
-    97:97:void process():758 -> c
-    98:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):989:1013 -> c
-    98:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    98:122:void process():758 -> c
-    123:150:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1011:1038 -> c
-    123:150:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    123:150:void process():758 -> c
-    151:154:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1037:1040 -> c
-    151:154:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    151:154:void process():758 -> c
-    155:182:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1022:1049 -> c
-    155:182:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    155:182:void process():758 -> c
-    183:189:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1047:1053 -> c
-    183:189:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    183:189:void process():758 -> c
-    190:190:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1051:1051 -> c
-    190:190:void processInstruction(com.android.tools.r8.ir.code.Instruction):799 -> c
-    190:190:void process():758 -> c
-    191:201:void processInstruction(com.android.tools.r8.ir.code.Instruction):801:811 -> c
-    191:201:void process():758 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.Z:
+    1:4:java.util.List getInstructionArray():742:745 -> a
+    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
+    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
+    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
+    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
+    39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
+    72:79:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1071:1078 -> a
+    80:115:void candidate(int,int):1085:1120 -> a
+    116:126:void reset(int):1125:1135 -> a
+    1:1:void invalidateInstructionArray():750:750 -> b
+    1:5:void process():756:760 -> c
+    6:16:void processInstruction(com.android.tools.r8.ir.code.Instruction):783:793 -> c
+    6:16:void process():760 -> c
+    17:103:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):826:912 -> c
+    17:103:void processInstruction(com.android.tools.r8.ir.code.Instruction):800 -> c
+    17:103:void process():760 -> c
+    104:104:void processInstruction(com.android.tools.r8.ir.code.Instruction):804:804 -> c
+    104:104:void process():760 -> c
+    105:133:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1025 -> c
+    105:133:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    105:133:void process():760 -> c
+    134:161:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1050 -> c
+    134:161:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    134:161:void process():760 -> c
+    162:165:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1049:1052 -> c
+    162:165:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    162:165:void process():760 -> c
+    166:193:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1061 -> c
+    166:193:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    166:193:void process():760 -> c
+    194:200:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1059:1065 -> c
+    194:200:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    194:200:void process():760 -> c
+    201:201:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1063:1063 -> c
+    201:201:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
+    201:201:void process():760 -> c
+    202:212:void processInstruction(com.android.tools.r8.ir.code.Instruction):809:819 -> c
+    202:212:void process():760 -> c
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.U:
     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
@@ -32447,7 +32571,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():1443:1443 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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
@@ -32459,20 +32583,20 @@
     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():1443:1443 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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():1443:1443 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     391: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():1443:1443 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> 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.V:
     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
@@ -32494,7 +32618,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.Y:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -32524,15 +32648,15 @@
     169:172:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):248:251 -> a
     169:172:void run():229 -> a
     173:174:void run():231:232 -> a
-    175:175:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    175:175:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     175:175:void run():232 -> a
     176:178:void run():232:234 -> a
     179:179:boolean lambda$run$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):189:189 -> a
     180:206:void killActiveFields(com.android.tools.r8.ir.code.FieldInstruction):262:288 -> a
     207:210:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.FieldInstruction):309:312 -> a
     1:2:void killAllActiveFields():257:258 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.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.W:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.X:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -32542,7 +32666,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.Z:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:54 -> a
@@ -32565,54 +32689,69 @@
     130:131: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
     130:131:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
     132:141:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):63:72 -> a
-    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    142:142:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     142:142:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72 -> a
     143:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.g0:
-    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):65:65 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
-    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):66 -> a
-    3:70:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):67:134 -> a
-    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    71:71:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):135 -> a
-    72:81:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):139:148 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.f0:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> d
-    com.android.tools.r8.ir.code.MemberType memberType -> f
-    com.android.tools.r8.ir.code.Value valueArray -> g
-    int index -> h
-    com.android.tools.r8.ir.code.IRCode code -> c
-    com.android.tools.r8.ir.code.InstructionListIterator iterator -> e
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):200:200 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):194:205 -> <init>
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.b0:
+    com.android.tools.r8.graph.AppView appView -> c
+    java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
+    com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):76:76 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
+    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
+    4:72:void rewrite(com.android.tools.r8.ir.code.IRCode):87:155 -> a
+    73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    73:73:void rewrite(com.android.tools.r8.ir.code.IRCode):155 -> a
+    74:84:void rewrite(com.android.tools.r8.ir.code.IRCode):159:169 -> a
+    85:96:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
+    97:129:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:216 -> a
+    97:129:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    130:142:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213:225 -> a
+    130:142:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    143:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):46:54 -> a
+    143:151:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    143:151:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    152:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):51:66 -> a
+    152:167:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    152:167:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    168:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):64:64 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    169:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):57:79 -> a
+    169:191:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    169:191:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    192:192:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    192:192:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    193:219:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):72:98 -> a
+    193:219:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    193:219:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    220:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):96:96 -> a
+    220:220:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    220:220:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    221:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):86:111 -> a
+    221:246:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225 -> a
+    221:246:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    247:248:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
+    247:248:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
+    249:249:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    250:250:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
+    251:251:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.a0:
+    com.android.tools.r8.ir.code.IRCode code -> a
+    com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
+    com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):260:263 -> <init>
     boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):209:210 -> a
-    3:6:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):289:292 -> a
-    3:6:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):214 -> a
-    7:23:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):215:231 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    24:24:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231 -> a
-    25:39:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):231:245 -> a
-    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):961:961 -> a
-    40:40:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):244 -> a
-    41:52:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):246:257 -> a
-    53:58:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,java.util.List):256:261 -> a
-    59:59:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):215:215 -> a
-    60:66:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):265:271 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    67:67:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):271 -> a
-    68:70:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):272:274 -> a
-    71:71:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    71:71:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276 -> a
-    72:75:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):276:279 -> a
-    76:76:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
-    76:76:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):279 -> a
-    77:82:void addNewServiceAndPutInArray(com.android.tools.r8.graph.DexClass):280:285 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.h0:
+    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):270:270 -> a
+    2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):286:289 -> a
+    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):269 -> a
+    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):270:282 -> a
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.c0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -32650,7 +32789,7 @@
     61:61:void replaceSwitchByOptimizedSwitch(int):140:140 -> b
     61:61:boolean optimize():66 -> b
     1:12:java.util.function.IntPredicate computeSuccessorHasBecomeDeadPredicate():91:102 -> c
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.i0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.d0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -32670,8 +32809,8 @@
     49:60:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):132:143 -> a
     61:61:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
     62:64:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.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.e0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.f0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -32679,7 +32818,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.i0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -32720,7 +32859,7 @@
     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:318:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
-    319:319:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    319:319:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     319:319:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
     320:325:void rewrite(com.android.tools.r8.ir.code.IRCode):426:431 -> a
     326:330:void logResults():458:462 -> a
@@ -32737,19 +32876,19 @@
     13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):321 -> b
     14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):322:325 -> b
     18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):320:330 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.l0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.g0:
     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.h0:
     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:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.o0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -32777,25 +32916,25 @@
     1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> c
     19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> d
-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:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.j0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.k0:
     java.util.BitSet used -> a
     1:3:void <init>():347:349 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
     1:1:java.util.BitSet getUsedArguments():352:352 -> a
     2:2:boolean register(int):357:357 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.q0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.l0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
     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:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.m0:
     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:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.n0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -32816,7 +32955,7 @@
     27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):172 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174:174 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.u0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.p0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -32828,10 +32967,10 @@
     51:53:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     51:53:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     54:63:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1019:1019 -> a
+    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
     64:64:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     65:66:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
-    67:67:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    67:67:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     67:67:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235 -> a
     68:89:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235:256 -> a
     90:90:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):173:173 -> a
@@ -32859,7 +32998,7 @@
     117:117:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
     118:119:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):265:266 -> a
     118:119:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
-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.p0.a:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNKNOWN_TYPE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NON_PROGRAM_CLASS -> d
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNUSED_INSTANCE -> a
@@ -32877,7 +33016,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus PINNED_FIELD -> n
     1:20:void <clinit>():37:56 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.u0.c:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.p0.c:
     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
@@ -32894,13 +33033,13 @@
     12:43:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):86:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:43:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:152 -> b
-    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> b
+    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
     44:44:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     45:49:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     50:50:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     50:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     51:54:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.u0.d:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.p0.d:
     int estimatedCombinedSizeForInlining -> o
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALLOWED_ZERO_TEST_TYPES -> p
     com.android.tools.r8.graph.AppView appView -> a
@@ -32918,104 +33057,105 @@
     java.util.Map methodCallsOnInstance -> l
     java.util.List unusedArguments -> n
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:3:void <clinit>():60:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):93:93 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):77:100 -> <init>
-    1:1:int getEstimatedCombinedSizeForInlining():104:104 -> a
-    2:31:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):261:290 -> a
-    32:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):945:957 -> a
-    32:44:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):291 -> a
-    45:82:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292:329 -> a
-    83:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):792:811 -> a
-    83:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    103:112:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):839:848 -> a
-    103:112:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
-    103:112:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    113:124:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):818:829 -> a
-    113:124:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330 -> a
-    125:128:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):339:342 -> a
-    129:131:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):279:281 -> a
-    132:132:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):369:369 -> a
-    133:139:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):408:414 -> a
-    133:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
+    1:3:void <clinit>():61:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):94:94 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):78:101 -> <init>
+    1:1:int getEstimatedCombinedSizeForInlining():105:105 -> a
+    2:31:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
+    32:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):955:967 -> a
+    32:44:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):292 -> a
+    45:82:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293:330 -> a
+    83:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):793:812 -> a
+    83:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    103:112:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):840:849 -> a
+    103:112:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):815 -> a
+    103:112:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    113:124:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:830 -> a
+    113:124:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
+    125:128:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340:343 -> a
+    129:131:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:282 -> a
+    132:132:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
+    133:139:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
+    133:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     140:140:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    140:140:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):414 -> a
-    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    141:146:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415:420 -> a
-    141:146:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
-    147:151:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):424:428 -> a
-    147:151:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):372 -> a
-    152:172:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):375:395 -> a
-    173:176:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):433:436 -> a
-    173:176:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):398 -> a
-    177:177:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399:399 -> a
-    178:223:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):459:504 -> a
-    178:223:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400 -> a
-    224:240:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):510:526 -> a
-    224:240:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
-    241:256:void removeFieldWrites():555:570 -> a
-    241:256:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    257:259:void removeFieldWrites():564:566 -> a
-    257:259:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    260:262:void removeFieldWrites():557:559 -> a
-    260:262:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
-    263:263:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403:403 -> a
-    264:268:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):534:538 -> a
-    269:280:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):537:548 -> a
-    281:281:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
-    281:281:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548 -> a
-    282:282:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:549 -> a
+    140:140:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
+    140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    141:146:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
+    141:146:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
+    147:151:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode):425:429 -> a
+    147:151:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):373 -> a
+    152:172:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):376:396 -> a
+    173:176:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode):434:437 -> a
+    173:176:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):399 -> a
+    177:177:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):400:400 -> a
+    178:223:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:505 -> a
+    178:223:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    224:240:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):511:527 -> a
+    224:240:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    241:256:void removeFieldWrites():556:571 -> a
+    241:256:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    257:259:void removeFieldWrites():565:567 -> a
+    257:259:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    260:262:void removeFieldWrites():558:560 -> a
+    260:262:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    263:263:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    264:268:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):535:539 -> a
+    269:280:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):538:549 -> a
+    281:281:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    281:281:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
+    282:282:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550:550 -> a
     283:283:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    283:283:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549 -> a
-    284:287:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):548:551 -> a
-    288:288:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):538:538 -> a
-    289:294:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):576:581 -> a
-    295:327:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):580:612 -> a
+    283:283:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):550 -> a
+    284:287:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):549:552 -> a
+    288:288:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):539:539 -> a
+    289:294:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):577:582 -> a
+    295:327:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):581:613 -> a
     328:328:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    328:328:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):612 -> a
-    329:348:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):613:632 -> a
-    349:349:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):581:581 -> a
-    350:380:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):647:677 -> a
-    350:380:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):695 -> a
-    381:383:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):686:688 -> a
-    384:390:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:693 -> a
-    391:391:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):691:691 -> a
-    392:394:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):699:701 -> a
-    395:395:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):702:702 -> a
-    396:432:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):712:748 -> a
-    433:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):752:764 -> a
-    446:476:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):861:891 -> a
-    477:480:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):913:916 -> a
-    477:480:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):892 -> a
+    328:328:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):613 -> a
+    329:348:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):614:633 -> a
+    349:349:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):582:582 -> a
+    350:380:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):648:678 -> a
+    350:380:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):696 -> a
+    381:383:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):687:689 -> a
+    384:390:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):688:694 -> a
+    391:391:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):692:692 -> a
+    392:394:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):700:702 -> a
+    395:395:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703:703 -> a
+    396:432:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):713:749 -> a
+    433:445:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):753:765 -> a
+    446:476:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):862:892 -> a
+    477:480:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):923:926 -> a
+    477:480:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):893 -> a
     481:481:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
-    481:481:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):916 -> a
-    481:481:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):892 -> a
-    482:482:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):918:918 -> a
-    482:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):892 -> a
-    483:500:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):887:904 -> a
-    501:501:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):903:903 -> a
-    502:514:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):964:976 -> a
-    515:515:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):990:990 -> a
-    516:517:void removeInstruction(com.android.tools.r8.ir.code.Instruction):990:991 -> a
-    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():147:249 -> b
-    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():233:233 -> b
-    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):688:688 -> b
-    106:113:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):922:929 -> b
-    106:113:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
+    481:481:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):926 -> a
+    481:481:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):893 -> a
+    482:482:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):928:928 -> a
+    482:482:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):893 -> a
+    483:509:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):888:914 -> a
+    510:510:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):909:909 -> a
+    511:524:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):974:987 -> a
+    525:525:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):986:986 -> a
+    526:526:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1001:1001 -> a
+    527:528:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1001:1002 -> a
+    1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
+    104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):689:689 -> b
+    106:113:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):932:939 -> b
+    106:113:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
     114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    114:114:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):929 -> b
-    114:114:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
-    115:120:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):930:935 -> b
-    115:120:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
+    114:114:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
+    114:114:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
+    115:120:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):940:945 -> b
+    115:120:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
     121:121:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    121:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):935 -> b
-    121:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):939 -> b
-    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):940:940 -> b
-    1:17:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():110:126 -> c
+    121:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):945 -> b
+    121:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):949 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):950:950 -> b
+    1:17:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():111:127 -> c
     18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> c
-    18:18:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():126 -> c
-    19:24:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():126:131 -> c
-    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():441:453 -> d
+    18:18:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():127 -> c
+    19:24:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():127:132 -> c
+    1:13:void removeAssumeInstructionsLinkedToEligibleInstance():442:454 -> d
 com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.a:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo asMutableCallSiteOptimizationInfo() -> a
@@ -33491,7 +33631,56 @@
     boolean isDefaultMethodOptimizationInfo() -> x
     1:1:boolean mayHaveSideEffects():289:289 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():161:161 -> z
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.v0.a:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.a:
+    com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():19:19 -> e
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.b:
+    1:1:void <init>():16:16 -> <init>
+    void reportInstructionBudgetIsExceeded() -> a
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
+    void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
+    void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):20:24 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):29:43 -> a
+    void reportUnknownReason() -> b
+    void reportWillExceedInstructionBudget(int,int) -> b
+    void reportUnknownTarget() -> c
+    boolean verifyReasonHasBeenReported() -> d
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.q0.c:
+    com.android.tools.r8.graph.DexEncodedMethod callee -> a
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    java.io.PrintStream output -> c
+    boolean reasonHasBeenReported -> d
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:22 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):19:25 -> <init>
+    1:11:void print(java.lang.String):29:39 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):44:44 -> a
+    13:13:void reportInstructionBudgetIsExceeded():49:49 -> a
+    14:14:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):55:55 -> a
+    15:19:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:79 -> a
+    20:20:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):75:75 -> a
+    21:23:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:87 -> a
+    24:24:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):85:85 -> a
+    25:25:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    1:1:void reportUnknownReason():65:65 -> b
+    2:2:void reportWillExceedInstructionBudget(int,int):98:98 -> b
+    1:1:void reportUnknownTarget():70:70 -> c
+    1:1:boolean verifyReasonHasBeenReported():107:107 -> d
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.r0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -33512,7 +33701,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.v0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.r0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
@@ -33556,7 +33745,7 @@
     81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
     81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
     1:5:void processCode():172:176 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.v0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.r0.b:
     1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
@@ -33568,7 +33757,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.v0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.r0.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
@@ -33579,7 +33768,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.v0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.r0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -33615,14 +33804,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):139:140 -> e
     1:1:boolean isTrivial():130:130 -> f
     1:1:int size():72:72 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.v0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.r0.e:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):56:58 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.v0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.r0.f:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):218:219 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.v0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.r0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -33638,9 +33827,9 @@
     com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods() -> i
     com.android.tools.r8.graph.DexType getSuperClassType() -> j
     1:21:com.android.tools.r8.graph.DexProgramClass synthesizeClass():35:55 -> k
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.v0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.r0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.v0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.r0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -33653,114 +33842,111 @@
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
     java.util.function.BiFunction strategyFactory -> i
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):124:124 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):90:132 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> a
-    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):147:147 -> a
-    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):160:193 -> a
-    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):161:161 -> a
-    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):168:168 -> a
-    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:205 -> a
-    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):216:225 -> a
-    52:72:java.util.Map finalizeLambdaGroups():314:334 -> a
-    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):229 -> a
-    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):232:265 -> a
-    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):264:278 -> a
-    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):233:233 -> a
-    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
-    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):267:267 -> a
-    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):269:271 -> a
-    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):283:287 -> a
-    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):291:310 -> a
-    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):296:296 -> a
-    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):298:303 -> a
-    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):301:306 -> a
-    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> a
-    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):306 -> a
-    168:174:void removeTrivialLambdaGroups():340:346 -> a
-    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):354:364 -> a
-    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):363:376 -> a
-    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:370 -> a
-    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):366:372 -> a
-    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380:381 -> a
-    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    2:2:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    4:37:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    38:38:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    39:39:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    40:41:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    42:51:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    52:72:java.util.Map finalizeLambdaGroups():313:333 -> a
+    52:72:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    73:106:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    107:121:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    122:122:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    123:123:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    124:124:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    125:125:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    126:128:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    129:133:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    134:153:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    154:154:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    155:160:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    161:166:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    167:167:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    167:167:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    168:174:void removeTrivialLambdaGroups():339:345 -> a
+    175:185:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    186:199:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    200:204:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    205:211:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    212:213:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    212:213:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     214:215:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):382:404 -> a
-    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
+    214:215:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    214:215:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    216:238:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    216:238:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     239:239:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381 -> a
-    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):285 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:410 -> a
-    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):87 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):139:139 -> b
-    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):164:166 -> b
+    239:239:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    239:239:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408:409 -> a
+    240:241:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166 -> b
-    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):166:167 -> b
-    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):172:184 -> b
-    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):179:179 -> b
-    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):193:193 -> b
-    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):346:346 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):359:359 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> c
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):143:143 -> c
-    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):151:151 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):87:87 -> d
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):134:134 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.v0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.v0.k:
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> c
+    3:3:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> d
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.r0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.r0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):413:413 -> <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):414:418 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415:415 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):417:417 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):425:425 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):430:430 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):435:435 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):440:440 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):445:445 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):450:450 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.v0.l:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.r0.l:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
     java.util.Set typeAffectedValues -> m
-    1:1:void <clinit>():454:454 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):454:454 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):465:467 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:464 -> <init>
-    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):458:470 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):466:466 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):474:476 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):538:538 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):543:543 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):550:550 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):555:555 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):562:562 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):567:567 -> a
-    1:28:void processCode():483:510 -> b
-    29:48:void processCode():509:528 -> b
-    49:49:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> b
-    49:49:void processCode():528 -> b
-    50:51:void processCode():528:529 -> b
-    52:52:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):533:533 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.v0.m:
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.r0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():571:571 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):576:577 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):594:598 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):604:610 -> a
-    1:1:java.lang.Object apply(java.lang.Object):571:571 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):582:586 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):571 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.v0.o:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.r0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -33798,7 +33984,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.v0.p.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -33811,35 +33997,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.v0.p.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.v0.p.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.v0.p.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.v0.p.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.v0.p.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.v0.p.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.v0.p.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -33873,29 +34059,29 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.v0.p.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.v0.p.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.v0.p.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.v0.p.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.v0.p.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.v0.p.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -33904,7 +34090,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.v0.p.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -33945,7 +34131,7 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.v0.p.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -33954,93 +34140,93 @@
     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.v0.p.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.r0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):57:60 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup,com.android.tools.r8.graph.AppInfoWithSubtyping):59:62 -> <init>
     int getInstanceInitializerSize(java.util.List) -> a
     int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int) -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):65:65 -> a
-    1:1:void accept(java.lang.Object):45:45 -> accept
-    2:2:void accept(com.android.tools.r8.graph.DexClass):70:70 -> accept
-    2:2:void accept(java.lang.Object):45 -> accept
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError structureError(java.lang.String):67:67 -> a
+    1:1:void accept(java.lang.Object):47:47 -> accept
+    2:2:void accept(com.android.tools.r8.graph.DexClass):72:72 -> accept
+    2:2:void accept(java.lang.Object):47 -> accept
     3:3:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> accept
-    3:3:void accept(com.android.tools.r8.graph.DexClass):70 -> accept
-    3:3:void accept(java.lang.Object):45 -> accept
-    4:22:void accept(com.android.tools.r8.graph.DexClass):70:88 -> accept
-    4:22:void accept(java.lang.Object):45 -> accept
-    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):220:231 -> accept
-    23:34:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    23:34:void accept(java.lang.Object):45 -> accept
-    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):250:252 -> accept
-    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):231 -> accept
-    35:37:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    35:37:void accept(java.lang.Object):45 -> accept
-    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):234:235 -> accept
-    38:39:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    38:39:void accept(java.lang.Object):45 -> accept
-    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):244:244 -> accept
-    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):235 -> accept
-    40:40:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    40:40:void accept(java.lang.Object):45 -> accept
-    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):238:239 -> accept
-    41:42:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    41:42:void accept(java.lang.Object):45 -> accept
-    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236:236 -> accept
-    43:43:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    43:43:void accept(java.lang.Object):45 -> accept
-    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
-    44:44:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    44:44:void accept(java.lang.Object):45 -> accept
-    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):227:227 -> accept
-    45:45:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    45:45:void accept(java.lang.Object):45 -> accept
-    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):223:223 -> accept
-    46:46:void accept(com.android.tools.r8.graph.DexClass):88 -> accept
-    46:46:void accept(java.lang.Object):45 -> accept
-    47:47:void accept(com.android.tools.r8.graph.DexClass):86:86 -> accept
-    47:47:void accept(java.lang.Object):45 -> accept
-    48:61:void accept(com.android.tools.r8.graph.DexClass):83:96 -> accept
-    48:61:void accept(java.lang.Object):45 -> accept
-    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):129:133 -> accept
-    62:66:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    62:66:void accept(java.lang.Object):45 -> accept
-    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):149:211 -> accept
-    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    67:129:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    67:129:void accept(java.lang.Object):45 -> accept
-    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):152:206 -> accept
-    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    130:184:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    130:184:void accept(java.lang.Object):45 -> accept
-    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int) -> accept
-    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    185:197:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    185:197:void accept(java.lang.Object):45 -> accept
-    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):176:179 -> accept
-    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    198:201:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    198:201:void accept(java.lang.Object):45 -> accept
-    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):160:163 -> accept
-    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139 -> accept
-    202:205:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    202:205:void accept(java.lang.Object):45 -> accept
-    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):142:143 -> accept
-    206:207:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    206:207:void accept(java.lang.Object):45 -> accept
-    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:134 -> accept
-    208:208:void accept(com.android.tools.r8.graph.DexClass):96 -> accept
-    208:208:void accept(java.lang.Object):45 -> accept
-    209:228:void accept(com.android.tools.r8.graph.DexClass):94:113 -> accept
-    209:228:void accept(java.lang.Object):45 -> accept
-    229:233:void accept(com.android.tools.r8.graph.DexClass):112:116 -> accept
-    229:233:void accept(java.lang.Object):45 -> accept
-    234:234:void accept(com.android.tools.r8.graph.DexClass):71:71 -> accept
-    234:234:void accept(java.lang.Object):45 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.v0.p.r:
+    3:3:void accept(com.android.tools.r8.graph.DexClass):72 -> accept
+    3:3:void accept(java.lang.Object):47 -> accept
+    4:22:void accept(com.android.tools.r8.graph.DexClass):72:90 -> accept
+    4:22:void accept(java.lang.Object):47 -> accept
+    23:34:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):225:236 -> accept
+    23:34:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    23:34:void accept(java.lang.Object):47 -> accept
+    35:37:boolean isLambdaInitializerMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):255:257 -> accept
+    35:37:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):236 -> accept
+    35:37:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    35:37:void accept(java.lang.Object):47 -> accept
+    38:39:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):239:240 -> accept
+    38:39:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    38:39:void accept(java.lang.Object):47 -> accept
+    40:40:boolean isLambdaSingletonField(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):249:249 -> accept
+    40:40:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):240 -> accept
+    40:40:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    40:40:void accept(java.lang.Object):47 -> accept
+    41:42:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):243:244 -> accept
+    41:42:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    41:42:void accept(java.lang.Object):47 -> accept
+    43:43:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):241:241 -> accept
+    43:43:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    43:43:void accept(java.lang.Object):47 -> accept
+    44:44:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):237:237 -> accept
+    44:44:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    44:44:void accept(java.lang.Object):47 -> accept
+    45:45:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):232:232 -> accept
+    45:45:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    45:45:void accept(java.lang.Object):47 -> accept
+    46:46:void validateStatelessLambdaClassInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):228:228 -> accept
+    46:46:void accept(com.android.tools.r8.graph.DexClass):90 -> accept
+    46:46:void accept(java.lang.Object):47 -> accept
+    47:47:void accept(com.android.tools.r8.graph.DexClass):88:88 -> accept
+    47:47:void accept(java.lang.Object):47 -> accept
+    48:61:void accept(com.android.tools.r8.graph.DexClass):85:98 -> accept
+    48:61:void accept(java.lang.Object):47 -> accept
+    62:66:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):134:138 -> accept
+    62:66:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    62:66:void accept(java.lang.Object):47 -> accept
+    67:129:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):154:216 -> accept
+    67:129:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    67:129:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    67:129:void accept(java.lang.Object):47 -> accept
+    130:184:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):157:211 -> accept
+    130:184:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    130:184:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    130:184:void accept(java.lang.Object):47 -> accept
+    185:197:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):190:202 -> accept
+    185:197:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    185:197:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    185:197:void accept(java.lang.Object):47 -> accept
+    198:201:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):181:184 -> accept
+    198:201:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    198:201:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    198:201:void accept(java.lang.Object):47 -> accept
+    202:205:int validateInstanceInitializerParameterMapping(java.util.List,com.android.tools.r8.code.Instruction[],int):165:168 -> accept
+    202:205:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):144 -> accept
+    202:205:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    202:205:void accept(java.lang.Object):47 -> accept
+    206:207:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):147:148 -> accept
+    206:207:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    206:207:void accept(java.lang.Object):47 -> accept
+    208:208:void validateInstanceInitializer(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Code):139:139 -> accept
+    208:208:void accept(com.android.tools.r8.graph.DexClass):98 -> accept
+    208:208:void accept(java.lang.Object):47 -> accept
+    209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
+    209:228:void accept(java.lang.Object):47 -> accept
+    229:236:void accept(com.android.tools.r8.graph.DexClass):114:121 -> accept
+    229:236:void accept(java.lang.Object):47 -> accept
+    237:237:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
+    237:237:void accept(java.lang.Object):47 -> accept
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.r0.p.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -34053,7 +34239,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.v0.p.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -34088,7 +34274,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.v0.p.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -34118,7 +34304,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.v0.p.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.r0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -34128,13 +34314,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):961:961 -> 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):959:959 -> 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):961:961 -> 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):959:959 -> 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
@@ -34176,11 +34362,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):961:961 -> 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):959:959 -> 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):961:961 -> 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):959:959 -> 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
@@ -34189,7 +34375,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.v0.p.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.r0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -34209,7 +34395,7 @@
     1:10:int computeHashCode():80:89 -> c
     1:1:int hashCode():76:76 -> hashCode
     1:21:java.lang.String toString():113:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.v0.p.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -34290,7 +34476,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.v0.p.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.r0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -34306,7 +34492,7 @@
     1:1:void lambda$prepareInstructions$6(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> e
     1:1:void lambda$prepareInstructions$7(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> f
     1:65:void prepareInstructions():41:105 -> h
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.w0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.s0.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
@@ -34320,10 +34506,10 @@
     35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     35:35:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71 -> a
     36:40:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71:75 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.w0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.s0.b:
     boolean match(com.android.tools.r8.ir.code.InstructionListIterator) -> a
     boolean resetAfterMatch() -> a
-com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.w0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.s0.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
@@ -34334,7 +34520,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.w0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.ir.optimize.s0.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
@@ -34343,10 +34529,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.w0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.s0.e:
     java.util.List instructions -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[],java.util.List):14:16 -> <init>
-com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.w0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.s0.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
@@ -34367,12 +34553,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.w0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.s0.g:
     int getMin() -> a
     void setIndex(int) -> a
     java.util.function.Predicate getPredicate() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.w0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.s0.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
@@ -34384,7 +34570,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.w0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.s0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -34399,7 +34585,7 @@
     1:1:java.lang.Boolean lambda$test$3(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.w0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.s0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -34411,14 +34597,14 @@
     3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     1:1:java.util.function.Predicate getPredicate():21:21 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.w0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.s0.k:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
     1:6:void <init>():22:27 -> <init>
     boolean resetAfterMatch() -> a
     1:18:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):31:48 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.w0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.s0.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
@@ -34430,7 +34616,7 @@
     boolean resetAfterMatch() -> a
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37:37 -> a
     2:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):43:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.w0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.s0.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
@@ -34444,7 +34630,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.w0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.s0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -34456,7 +34642,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.x0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.t0.e:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase phase -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -34464,70 +34650,68 @@
     java.util.function.BiConsumer fixupStrategy -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():47:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):106:106 -> <init>
-    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):57:109 -> <init>
-    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):116:182 -> a
-    68:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):127:161 -> a
-    103:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):167:171 -> a
-    108:113:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):186:191 -> a
-    108:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):172 -> a
-    114:117:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:176 -> a
-    118:131:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):221:234 -> a
-    132:152:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233:253 -> a
-    153:161:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):339:347 -> a
-    153:161:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    162:162:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    162:162:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):350 -> a
-    162:162:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    163:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):353:393 -> a
-    163:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    204:204:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):421:421 -> a
-    204:204:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
-    204:204:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    205:210:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:401 -> a
-    205:210:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    211:234:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):426:449 -> a
-    211:234:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):401 -> a
-    211:234:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    235:242:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):402:409 -> a
-    235:242:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    243:250:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):454:461 -> a
-    243:250:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):409 -> a
-    243:250:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    251:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):410:414 -> a
-    251:255:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):254 -> a
-    256:257:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):260:261 -> a
-    258:262:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):329:333 -> a
-    258:262:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):261 -> a
-    263:287:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:286 -> a
-    288:300:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):468:480 -> a
-    288:300:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
-    301:333:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288:320 -> a
-    334:367:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):487:520 -> a
-    368:369:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):541:542 -> a
-    370:373:void setFixupStrategy(java.util.function.BiConsumer):553:556 -> a
-    374:377:void cleanFixupStrategy():560:563 -> a
-    1:3:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):546:548 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.x0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.x0.b:
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):108:108 -> <init>
+    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):59:111 -> <init>
+    1:67:void collectCandidates(com.android.tools.r8.graph.DexApplication):118:184 -> a
+    68:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):129:163 -> a
+    103:107:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):169:173 -> a
+    108:113:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):188:193 -> a
+    108:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
+    114:117:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
+    118:131:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
+    132:152:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:255 -> a
+    153:161:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):341:349 -> a
+    153:161:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    162:162:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
+    162:162:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):352 -> a
+    162:162:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    163:203:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):355:395 -> a
+    163:203:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    204:204:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):423:423 -> a
+    204:204:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):395 -> a
+    204:204:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    205:218:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):398:411 -> a
+    205:218:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    219:226:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):458:465 -> a
+    219:226:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):411 -> a
+    219:226:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    227:231:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):412:416 -> a
+    227:231:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):256 -> a
+    232:233:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:263 -> a
+    234:238:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331:335 -> a
+    234:238:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):263 -> a
+    239:263:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264:288 -> a
+    264:276:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):472:484 -> a
+    264:276:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288 -> a
+    277:309:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):290:322 -> a
+    310:335:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):428:453 -> a
+    336:381:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:536 -> a
+    382:382:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510:510 -> a
+    383:384:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
+    385:388:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
+    389:392:void cleanFixupStrategy():578:581 -> a
+    1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438:438 -> b
+    2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.t0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.t0.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):566:566 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):568:569 -> <init>
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):573:574 -> a
-    3:4:boolean registerField(com.android.tools.r8.graph.DexField):579:580 -> a
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):616:616 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):611:611 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):591:591 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):601:601 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):596:596 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):606:606 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):586:586 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):621:621 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):626:626 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):631:631 -> registerStaticFieldWrite
-    1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):636:638 -> registerTypeReference
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.x0.c:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):584:584 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):586:587 -> <init>
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):591:592 -> a
+    3:4:boolean registerField(com.android.tools.r8.graph.DexField):597:598 -> a
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):634:634 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):629:629 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):609:609 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):619:619 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):614:614 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):624:624 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):604:604 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):639:639 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):644:644 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):649:649 -> registerStaticFieldWrite
+    1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):654:656 -> registerTypeReference
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.t0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -34537,24 +34721,24 @@
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.Set referencedFrom -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):65:80 -> <init>
-    1:1:com.android.tools.r8.graph.DexType hostType():88:88 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():98:98 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.ir.optimize.x0.d:
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
+    1:1:com.android.tools.r8.graph.DexType hostType():90:90 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase -> com.android.tools.r8.ir.optimize.t0.d:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Fixup -> c
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase Examine -> b
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$Phase None -> a
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(java.lang.String,int):53:53 -> <init>
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.x0.f:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):55:55 -> <init>
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.t0.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):33:35 -> mapInvocationType
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.x0.g:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.t0.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     boolean $assertionsDisabled -> i
@@ -34570,55 +34754,55 @@
     1:1:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):77:77 -> a
     2:5:void prepareCandidates():213:216 -> a
     2:5:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():92:92 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94:94 -> a
     6:6:void prepareCandidates():218 -> a
     6:6:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():92 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():94 -> a
     7:7:void prepareCandidates():218 -> a
     7:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():93:93 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():95:95 -> a
     8:8:void prepareCandidates():218 -> a
     8:8:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     9:17:void prepareCandidates():219:227 -> a
     9:17:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
-    18:18:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    18:18:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     18:18:void prepareCandidates():228 -> a
     18:18:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     19:28:void prepareCandidates():228:237 -> a
     19:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80 -> a
     29:30:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:84 -> a
     31:35:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):83:87 -> a
-    36:47:java.util.Set staticizeMethodSymbols():561:572 -> a
+    36:47:java.util.Set staticizeMethodSymbols():566:577 -> a
     36:47:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    48:48:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    48:48:java.util.Set staticizeMethodSymbols():573 -> a
+    48:48:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    48:48:java.util.Set staticizeMethodSymbols():578 -> a
     48:48:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    49:62:java.util.Set staticizeMethodSymbols():573:586 -> a
+    49:62:java.util.Set staticizeMethodSymbols():578:591 -> a
     49:62:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    63:63:java.util.Set staticizeMethodSymbols():586 -> a
+    63:63:java.util.Set staticizeMethodSymbols():591 -> a
     63:63:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    64:65:java.util.Set staticizeMethodSymbols():587:588 -> a
+    64:65:java.util.Set staticizeMethodSymbols():592:593 -> a
     64:65:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    66:104: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):615:653 -> a
-    66:104:java.util.Set staticizeMethodSymbols():590 -> a
+    66:104: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):620:658 -> a
+    66:104:java.util.Set staticizeMethodSymbols():595 -> a
     66:104:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    105:105:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    105:105: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):655 -> a
-    105:105:java.util.Set staticizeMethodSymbols():590 -> a
+    105:105:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    105:105: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 -> a
+    105:105:java.util.Set staticizeMethodSymbols():595 -> a
     105:105:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    106:106: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):655:655 -> a
-    106:106:java.util.Set staticizeMethodSymbols():590 -> a
+    106:106: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:660 -> a
+    106:106:java.util.Set staticizeMethodSymbols():595 -> a
     106:106:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    107:119: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):654:666 -> a
-    107:119:java.util.Set staticizeMethodSymbols():590 -> a
+    107:119: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):659:671 -> a
+    107:119:java.util.Set staticizeMethodSymbols():595 -> a
     107:119:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
-    120:121:java.util.Set staticizeMethodSymbols():596:597 -> a
+    120:121:java.util.Set staticizeMethodSymbols():601:602 -> a
     120:121:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):90 -> a
     122:124:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):95:97 -> a
     125:180:void finalEligibilityCheck():101:156 -> a
-    181:181:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    181:181:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     181:181:void finalEligibilityCheck():156 -> a
     182:192:void finalEligibilityCheck():156:166 -> a
     193:222:void finalEligibilityCheck():165:194 -> a
@@ -34630,7 +34814,7 @@
     260:264:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:266 -> a
     265:265:java.lang.Object lambda$processMethodsConcurrently$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):262:262 -> a
     266:278:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277:289 -> a
-    279:279:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
+    279:279:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
     279:279:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
     280:285:void removeCandidateInstantiation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289:294 -> a
     286:286:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
@@ -34642,54 +34826,54 @@
     290:297:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):318:325 -> a
     298:298:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     298:298:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
-    299:318:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:356 -> a
-    319:323:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):363:367 -> a
-    324:341:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):366:383 -> a
-    342:364:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):422:444 -> a
-    365:370:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):452:457 -> a
-    371:388:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):456:473 -> a
-    389:395:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):477:483 -> a
-    396:396:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):961:961 -> a
-    396:396:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):483 -> a
-    397:404:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):484:491 -> a
-    405:405:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    405:405:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):490 -> a
-    406:406:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):549:549 -> a
-    407:407:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    407:407:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551 -> a
-    408:410:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):551:553 -> a
-    411:411:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    411:411:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555 -> a
-    412:412:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):555:555 -> a
-    413:416:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):603:606 -> a
-    417:417:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):605:605 -> a
-    418:418:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):606:606 -> a
-    419:419: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):671:671 -> a
-    420:420:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> a
-    420:420: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):672 -> a
-    421:422: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):673:674 -> a
-    423:423: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):672:672 -> a
+    299:319:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:357 -> a
+    320:324:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
+    325:342:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
+    343:366:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:446 -> a
+    367:372:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
+    373:390:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
+    391:400:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
+    401:401:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    401:401:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
+    402:409:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
+    410:410:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    410:410:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):495 -> a
+    411:411:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):554:554 -> a
+    412:412:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    412:412:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556 -> a
+    413:415:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):556:558 -> a
+    416:416:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    416:416:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560 -> a
+    417:417:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):560:560 -> a
+    418:421:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):608:611 -> a
+    422:422:boolean lambda$classMembersConflict$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):610:610 -> a
+    423:423:boolean lambda$classMembersConflict$7(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    424:424: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):676:676 -> a
+    425:425:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> a
+    425:425:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677 -> a
+    426:427:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):678:679 -> a
+    428:428:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
     1:21:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> c
-    22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):497 -> c
+    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     22:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):498:511 -> c
+    23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
     23:36:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    37:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):510:512 -> c
+    37:39:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):515:517 -> c
     37:39:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):509:509 -> c
+    40:40:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):514:514 -> c
     40:40:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):507:530 -> c
+    41:64:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):512:535 -> c
     41:64:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    65:65:com.android.tools.r8.graph.DexItemFactory factory():679:679 -> c
-    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532 -> c
+    65:65:com.android.tools.r8.graph.DexItemFactory factory():684:684 -> c
+    65:65:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537 -> c
     65:65:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):532:539 -> c
+    66:73:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:544 -> c
     66:73:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    74:76:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):538:540 -> c
+    74:76:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):543:545 -> c
     74:76:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    77:81:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):537:541 -> c
+    77:81:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     77:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration:
     boolean isAppendMethod(com.android.tools.r8.graph.DexMethod) -> a
@@ -34819,7 +35003,7 @@
     209:225:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     226:226:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     227:228:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     229:229:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     230:266:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:613 -> a
     267:272:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -34827,28 +35011,28 @@
     277:281:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):588:592 -> a
     282:286:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
     287:316:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:622 -> a
-    317:317:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    317:317:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     317:317:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     318:318:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     319:319:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     320:346:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:654 -> a
     320:346:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     347:353:void removeTrivialBuilders():728:734 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     354:354:void removeTrivialBuilders():734 -> a
     355:367:void removeTrivialBuilders():735:747 -> a
-    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     368:368:void removeTrivialBuilders():747 -> a
     369:398:void removeTrivialBuilders():748:777 -> a
-    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     399:399:void removeTrivialBuilders():777 -> a
     400:409:void removeTrivialBuilders():778:787 -> a
-    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     410:410:void removeTrivialBuilders():777 -> a
-    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     411:411:void removeTrivialBuilders():747 -> a
-    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     412:412:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
@@ -34880,19 +35064,19 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
     41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):132:135 -> a
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):136 -> a
     46:95:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137:186 -> a
     96:101:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:189 -> a
     102:193:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):188:279 -> a
-    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    194:194:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     194:194:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279 -> a
     195:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279:279 -> a
     196:199:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):200:203 -> a
     200:200:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):217:217 -> a
     201:201:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):223:223 -> a
     202:205:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):286:289 -> a
-    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> a
+    206:206:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
     206:206:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):291 -> a
     207:248:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):292:333 -> a
     249:249:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -34900,7 +35084,7 @@
     250:307:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):341:398 -> a
     308:359:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):379:430 -> a
     360:376:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):428:444 -> a
-    377:377:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> a
+    377:377:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     377:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444 -> a
     378:381:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444:447 -> a
     382:387:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):473:478 -> a
@@ -34914,11 +35098,11 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):227:227 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):452:457 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):499:499 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):500 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):501:521 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:562 -> b
-    83:83:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):45:45 -> 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):562 -> b
     84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):562:562 -> b
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):209:209 -> c
@@ -34971,7 +35155,7 @@
     104:104:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     105:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
     105:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
-    126:126:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    126:126:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     127:129:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:493 -> a
@@ -35254,16 +35438,16 @@
     1444:1444:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2328 -> a
     1445:1452:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2329:2336 -> a
     1453:1488:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2444:2479 -> a
-    1489:1489:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1489:1489:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1489:1489:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1489:1489:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1490:1496:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1497:1548:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1549:1555:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1556:1556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1556:1556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1556:1556:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1557:1564:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1565:1565:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> a
+    1565:1565:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
     1565:1565:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1565:1565:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1566:1603:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -35336,10 +35520,10 @@
     117:117:void performAllocation():637:637 -> b
     117:117:void allocateRegisters():214 -> b
     118:130:void allocateRegisters():215:227 -> b
-    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> b
+    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
     131:131:void allocateRegisters():227 -> b
     132:136:void allocateRegisters():228:232 -> b
-    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():881:881 -> b
+    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
     137:137:void allocateRegisters():227 -> b
     138:138:void allocateRegisters():236:236 -> b
     139:144:void clearState():531:536 -> b
@@ -35782,7 +35966,7 @@
     40:47:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):201:208 -> a
     48:50: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
     51:61:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):284:294 -> a
-    62:62:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1443:1443 -> a
+    62:62:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
     62:62:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     63:74:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     75:78:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -35834,42 +36018,64 @@
     1:1:java.lang.String toString():68:68 -> toString
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.w.e.a$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CfEmulateInterfaceSyntheticSourceCodeProvider -> com.android.tools.r8.w.e.b:
-    com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.method -> a
-    com.android.tools.r8.graph.AppView com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.appView -> c
-    com.android.tools.r8.graph.DexType interfaceType -> d
-    com.android.tools.r8.graph.DexMethod libraryMethod -> f
-    com.android.tools.r8.graph.DexMethod companionMethod -> e
-    java.util.List extraDispatchCases -> g
-    com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.originalMethod -> b
-    1:4:void com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.<init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:31 -> <init>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):44 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):45:48 -> <init>
-    1:40:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):53:92 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    1:40:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):50:50 -> a
-    41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    41:41:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    41:41:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():68:68 -> a
-    42:42:java.util.List com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.defaultTryCatchs():0 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):55 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    42:42:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    42:42:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):56:56 -> a
-    43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.standardCfCodeFromInstructions(java.util.List):0 -> a
-    43:43:com.android.tools.r8.graph.CfCode generateCfCode(com.android.tools.r8.ir.code.Position):93 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):36 -> a
-    43:43:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):37:43 -> a
-    44:50:com.android.tools.r8.ir.conversion.SourceCode com.android.tools.r8.ir.synthetic.CfSyntheticSourceCodeProvider.get(com.android.tools.r8.ir.code.Position):0 -> a
-    51:54:void addReturn(java.util.List):104:107 -> a
-    1:2:void loadExtraParameters(java.util.List):98:99 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.w.e.c:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.w.e.g:
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45:45 -> a
+    1:1:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):45 -> a
+    2:2:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):48:54 -> a
+    3:9:boolean access$000(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):38 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.w.e.b:
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):286:287 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():292:300 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():298:298 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():295:307 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.w.e.c:
+    com.android.tools.r8.graph.DexString message -> c
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):317:318 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():323:333 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():331:331 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():328:337 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.w.e.d:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):77:81 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():86:102 -> a
+    18:53:com.android.tools.r8.graph.CfCode generateCfCode():99:134 -> a
+    54:54:com.android.tools.r8.graph.CfCode generateCfCode():133:133 -> a
+    55:67:com.android.tools.r8.graph.CfCode generateCfCode():130:142 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.w.e.e:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
+    boolean itfCall -> f
+    com.android.tools.r8.graph.DexField wrapperField -> c
+    com.android.tools.r8.graph.DexMethod forwardMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,boolean):160:164 -> <init>
+    1:20:com.android.tools.r8.graph.CfCode generateCfCode():169:188 -> a
+    21:45:com.android.tools.r8.graph.CfCode generateCfCode():185:209 -> a
+    46:46:com.android.tools.r8.graph.CfCode generateCfCode():208:208 -> a
+    47:60:com.android.tools.r8.graph.CfCode generateCfCode():205:218 -> a
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.w.e.f:
+    com.android.tools.r8.graph.DexField wrapperField -> e
+    com.android.tools.r8.graph.DexType argType -> c
+    com.android.tools.r8.graph.DexField reverseWrapperField -> d
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):230:233 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():238:273 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():271:271 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():268:277 -> a
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.w.e.h:
+    java.util.List extraDispatchCases -> f
+    com.android.tools.r8.graph.DexType interfaceType -> c
+    com.android.tools.r8.graph.DexMethod libraryMethod -> e
+    com.android.tools.r8.graph.DexMethod companionMethod -> d
+    1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):40:44 -> <init>
+    1:41:com.android.tools.r8.graph.CfCode generateCfCode():49:89 -> a
+    1:4:void addReturn(java.util.List):100:103 -> b
+    1:2:void loadExtraParameters(java.util.List):94:95 -> c
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.w.e.i:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -35890,7 +36096,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.w.e.d:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.w.e.j:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -35907,7 +36113,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> h
     1:27:boolean checkSignatures():146:172 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.w.e.d$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.w.e.j$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -35927,7 +36133,7 @@
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.w.e.e:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.w.e.k:
     java.util.function.Consumer registryCallback -> b
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> a
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
@@ -35935,7 +36141,15 @@
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> getSourceCodeProvider
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.w.e.f:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.w.e.l:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.graph.DexType holder -> b
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
+    1:1:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):28:28 -> a
+    2:2:java.util.List defaultTryCatchs():46:46 -> a
+    2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
+    3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.w.e.m:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -40880,11 +41094,11 @@
     44:55:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):249:260 -> a
     44:55:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):151 -> a
     56:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):153:195 -> a
-    99:103:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
+    99:103:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
     99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
     109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     110:114:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     115:122:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -40916,7 +41130,7 @@
     256:256:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):416:416 -> a
     257:257:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):414:414 -> a
     1:9:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> b
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():308:308 -> b
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
     10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> b
     11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> b
     12:23:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> b
@@ -46300,6 +46514,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.z.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.z.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46316,6 +46531,7 @@
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.z.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.z.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46331,6 +46547,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.z.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.z.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.z.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46344,6 +46561,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.z.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.z.b.a.c.j:
@@ -47246,24 +47464,24 @@
     java.lang.String renamedName -> b
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNamingForMapApplier$1):35:35 -> <init>
-    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):124:130 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):96:96 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():134:134 -> a
-    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):147:148 -> a
-    3:4:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):140 -> a
-    5:6:void forAllMethodNaming(com.android.tools.r8.utils.ThrowingConsumer):155:156 -> a
-    5:6:void forAllMemberNaming(com.android.tools.r8.utils.ThrowingConsumer):141 -> a
-    7:8:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):164:165 -> a
+    2:8:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):122:128 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder builder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):94:94 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getQualifiedMethodMembers():132:132 -> a
+    3:4:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):145:146 -> a
+    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):166 -> a
-    10:17:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):166:173 -> 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):174 -> a
-    19:19:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):174:174 -> a
-    1:11:boolean equals(java.lang.Object):223:233 -> equals
-    1:1:int hashCode():238:238 -> hashCode
+    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
+    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
-    2:2:int hashCode():238 -> hashCode
+    2:2:int hashCode():236 -> hashCode
 com.android.tools.r8.naming.ClassNamingForMapApplier$1 -> com.android.tools.r8.naming.d:
 com.android.tools.r8.naming.ClassNamingForMapApplier$Builder -> com.android.tools.r8.naming.e$a:
     com.android.tools.r8.position.Position position -> c
@@ -47277,13 +47495,13 @@
     2:2:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):46:46 -> <init>
     3:11:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):42:50 -> <init>
     void addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.Object,java.lang.String) -> a
-    1:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:65 -> a
-    10:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):64:65 -> a
-    12:22:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:73 -> a
-    23:24:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):72:73 -> a
-    25:25:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):71:71 -> a
-    26:26:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
-    27:27:com.android.tools.r8.naming.ClassNamingForMapApplier build():81:81 -> a
+    1:8:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):57:64 -> a
+    9:9:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):63:63 -> a
+    10:19:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):62:71 -> a
+    20:20:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):70:70 -> a
+    21:21:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):69:69 -> a
+    22:22:java.util.List lambda$addMemberEntry$0(com.android.tools.r8.naming.MemberNaming$MethodSignature):60:60 -> a
+    23:23:com.android.tools.r8.naming.ClassNamingForMapApplier build():79:79 -> a
 com.android.tools.r8.naming.ClassNamingForNameMapper -> com.android.tools.r8.naming.f:
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
@@ -47433,10 +47651,10 @@
     87:87:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):77:77 -> a
     87:87:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):124 -> a
     88:89:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    90:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:266 -> a
+    90:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:272 -> a
     90:91:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     92:93:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
-    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):265:265 -> a
+    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:271 -> a
     94:94:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     95:99:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):143:147 -> a
     100:100:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
@@ -48168,7 +48386,7 @@
     2:31:void <init>(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):30:59 -> <init>
     boolean hasPrefixRewritingLogic() -> a
     com.android.tools.r8.graph.DexItem lambda$getRenamedItems$2(com.android.tools.r8.graph.DexItem) -> a
-    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):29:29 -> a
+    1:1:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     1:1:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):54 -> a
     2:2:void lambda$new$0(com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.graph.DexType):55:55 -> a
     3:3:com.android.tools.r8.naming.NamingLens createPrefixRewritingNamingLens(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):36:36 -> a
@@ -48185,7 +48403,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():308:308 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> 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
@@ -48220,28 +48438,28 @@
     2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):68:85 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):70:70 -> a
     2:31:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:119 -> a
-    32:40:void computeDefaultInterfaceMethodMethods():319:327 -> a
+    32:40:void computeDefaultInterfaceMethodMethods():318:326 -> a
     32:40:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    41:41:void computeDefaultInterfaceMethodMethods():327 -> a
+    41:41:void computeDefaultInterfaceMethodMethods():326 -> a
     41:41:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    42:42:void computeDefaultInterfaceMethodMethods():329:329 -> a
+    42:42:void computeDefaultInterfaceMethodMethods():328:328 -> a
     42:42:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:349 -> a
-    43:47:void computeDefaultInterfaceMethodMethods():329 -> a
+    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:348 -> a
+    43:47:void computeDefaultInterfaceMethodMethods():328 -> a
     43:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):349 -> a
-    48:48:void computeDefaultInterfaceMethodMethods():329 -> a
+    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):348 -> a
+    48:48:void computeDefaultInterfaceMethodMethods():328 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):350:365 -> a
-    49:64:void computeDefaultInterfaceMethodMethods():329 -> a
+    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):349:364 -> a
+    49:64:void computeDefaultInterfaceMethodMethods():328 -> a
     49:64:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:368 -> a
-    65:69:void computeDefaultInterfaceMethodMethods():329 -> a
+    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:367 -> a
+    65:69:void computeDefaultInterfaceMethodMethods():328 -> a
     65:69:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
-    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    70:70:void computeDefaultInterfaceMethodMethods():329 -> a
+    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    70:70:void computeDefaultInterfaceMethodMethods():328 -> a
     70:70:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     71:113:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
     114:114:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:111 -> a
@@ -48279,46 +48497,46 @@
     244:245:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):286:287 -> a
     246:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:295 -> a
     248:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:299 -> a
-    254:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:312 -> a
-    263:264:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:312 -> a
-    265:269:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
+    254:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    263:267:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
     1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
     2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
     3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.L:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <init>
-    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:390 -> a
-    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:398 -> b
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <init>
+    1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):387:389 -> a
+    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:397 -> b
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398 -> b
-    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):400:415 -> b
+    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397 -> b
+    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):399:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):443:443 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):451:451 -> a
-    3:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):461:461 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):460:460 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):461 -> a
-    5:8:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):462:465 -> a
-    9:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):505:511 -> a
-    9:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    16:16:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):508:508 -> a
-    16:16:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):466 -> a
-    17:19:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):470:472 -> a
-    20:20:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):477:477 -> a
-    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):482:482 -> a
-    22:27:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:492 -> 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):443:443 -> 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):451:451 -> b
+    4:4:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):460 -> a
+    5:8:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):461:464 -> a
+    9:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    9:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    16:16:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    16:16:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):465 -> a
+    17:19:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):469:471 -> a
+    20:20:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    22:27:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:491 -> a
+    1:1:com.android.tools.r8.graph.DexString lambda$next$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):442:442 -> b
+    2:2:com.android.tools.r8.graph.DexString lambda$next$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.P:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -48529,23 +48747,23 @@
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     com.android.tools.r8.utils.Reporter reporter -> b
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter,com.android.tools.r8.naming.SeedMapper$1):36:36 -> <init>
-    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):88:95 -> <init>
-    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82:82 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:74 -> a
-    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):68:68 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75 -> a
-    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):76:78 -> a
-    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74:78 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):82 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):138:138 -> a
-    14:14:java.util.Set getKeyset():142:142 -> a
-    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):146:146 -> a
-    1:11:void verifyMappingsAreConflictFree():99:109 -> b
-    12:16:void verifyMappingsAreConflictFree():106:110 -> b
-    17:40:void verifyMappingsAreConflictFree():105:128 -> b
+    2:9:void <init>(java.util.Map,com.android.tools.r8.utils.Reporter):87:94 -> <init>
+    1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81:81 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):72:73 -> a
+    2:3:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper$Builder builder(com.android.tools.r8.utils.Reporter):67:67 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):74 -> a
+    4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):75:77 -> a
+    5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):73:77 -> a
+    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):81 -> a
+    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):136:136 -> a
+    14:14:java.util.Set getKeyset():140:140 -> a
+    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):144:144 -> a
+    1:10:void verifyMappingsAreConflictFree():98:107 -> b
+    11:11:void verifyMappingsAreConflictFree():104:104 -> b
+    12:35:void verifyMappingsAreConflictFree():103:126 -> b
 com.android.tools.r8.naming.SeedMapper$1 -> com.android.tools.r8.naming.V$a:
 com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.V$b:
     java.util.Map map -> a
@@ -48555,9 +48773,9 @@
     3:7:void <init>(com.android.tools.r8.utils.Reporter):39:43 -> <init>
     1:4:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):49:52 -> a
     1:4:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    5:9:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:55 -> a
-    5:9:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
-    10:11:com.android.tools.r8.naming.SeedMapper build():62:63 -> a
+    5:8:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):51:54 -> a
+    5:8:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38 -> a
+    9:10:com.android.tools.r8.naming.SeedMapper build():61:62 -> a
 com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.naming.W:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -48712,20 +48930,20 @@
     2:24:void run(java.lang.Iterable):47:69 -> a
     25:26:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):63:64 -> a
     27:28:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):71:72 -> a
-    29:58: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):88:117 -> a
-    59:64:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):122:127 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    65:65:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127 -> a
-    66:79:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):127:140 -> a
-    80:80:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    80:80:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
-    81:81:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
-    82:82:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    82:82:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
-    83:83:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
-    84:84:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    84:84:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
-    85:85:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
+    29:67:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):89:127 -> a
+    68:73:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):132:137 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    74:74:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137 -> a
+    75:88:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137:150 -> a
+    89:89:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    89:89:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
+    90:90:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
+    91:91:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    91:91:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
+    92:92:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
+    93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    93:93:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
+    94:94:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
     1:1:com.android.tools.r8.utils.Reporter access$300(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> c
 com.android.tools.r8.naming.signature.GenericSignatureRewriter$1 -> com.android.tools.r8.naming.Y.c:
@@ -48733,27 +48951,27 @@
     java.lang.StringBuilder renamedSignature -> a
     com.android.tools.r8.naming.signature.GenericSignatureRewriter this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):143:143 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):143:143 -> <init>
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter):153:153 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureRewriter,com.android.tools.r8.naming.signature.GenericSignatureRewriter$1):153:153 -> <init>
     void stop() -> a
-    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143:143 -> a
-    2:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):174:181 -> a
-    2:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):180:180 -> a
-    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    11:18:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):179:186 -> a
-    11:18:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    19:34:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):185:200 -> a
-    19:34:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    35:44:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):197:206 -> a
-    35:44:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):143 -> a
-    45:45:void parsedSymbol(char):152:152 -> a
-    46:52:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):162:168 -> a
-    46:52:java.lang.Object parsedTypeName(java.lang.String):143 -> a
-    1:1:void parsedIdentifier(java.lang.String):157:157 -> b
-    2:2:void start():213:213 -> b
-    1:1:java.lang.String getRenamedSignature():147:147 -> c
+    1:1:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153:153 -> a
+    2:9:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):184:191 -> a
+    2:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
+    10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    11:18:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189:196 -> a
+    11:18:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    19:34:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):195:210 -> a
+    19:34:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    35:44:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):207:216 -> a
+    35:44:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
+    45:45:void parsedSymbol(char):162:162 -> a
+    46:52:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:178 -> a
+    46:52:java.lang.Object parsedTypeName(java.lang.String):153 -> a
+    1:1:void parsedIdentifier(java.lang.String):167:167 -> b
+    2:2:void start():223:223 -> b
+    1:1:java.lang.String getRenamedSignature():157:157 -> c
 com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.C.a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
@@ -48838,7 +49056,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():329:329 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> 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
@@ -49501,7 +49719,13 @@
     java.lang.String catchTypeDescriptor -> e
     1:6:void <init>(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int,java.lang.String):90:95 -> <init>
     7:8:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> <init>
-    1:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:148 -> a
+    1:17:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:139 -> a
+    18:19:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    18:19:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):139 -> a
+    20:24:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):143:147 -> a
+    25:26:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
+    25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
+    27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
 com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.D.a.a.s:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
@@ -50905,79 +51129,79 @@
     46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> stripAttributes
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):224:224 -> <init>
-    2:190:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:262 -> <init>
-    191:191:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):303:303 -> <init>
-    192:459:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:341 -> <init>
-    460:460:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):345:345 -> <init>
-    461:499:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:391 -> <init>
-    500:543:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):353:396 -> <init>
-    544:544:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):401:401 -> <init>
-    545:924:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:453 -> <init>
-    925:941:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):449:465 -> <init>
-    942:957:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):461:476 -> <init>
-    958:964:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):472:478 -> <init>
-    965:965:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):485:485 -> <init>
-    966:1416:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:524 -> <init>
-    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):590:595 -> a
-    7:7:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):755:755 -> a
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1169:1171 -> addEnumValueInfoMaps
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1162:1164 -> addSwitchMaps
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):628:639 -> assertNoItemRemoved
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):545:577 -> computeReachableInterfaces
-    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:609 -> filter
-    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):607:607 -> filter
-    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):996:1035 -> findSingleTargetFromSubtypes
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):613:614 -> getEnumValueInfoMapFor
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():624:624 -> getFieldAccessInfoCollection
-    1:2:java.lang.Iterable getPinnedItems():814:815 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():846:847 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):618:619 -> getSwitchMapFor
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):764:765 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasLiveness():770:770 -> hasLiveness
-    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1051:1060 -> interfacesMayHaveDefaultFor
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):678:688 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):692:693 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):697:708 -> isFieldWrittenByFieldPutInstruction
-    1:3:boolean isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):716:718 -> isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers
-    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):645:650 -> isInstantiatedDirectly
-    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):672:674 -> isInstantiatedDirectlyOrIndirectly
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):654:668 -> isInstantiatedIndirectly
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):733:734 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):528:528 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):532:533 -> isLiveProgramType
-    1:20:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):787:806 -> isMethodPinnedDirectlyOrInAncestor
-    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):537:541 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):781:782 -> isPinned
-    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):722:724 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1068:1069 -> lookupSingleInterfaceTarget
-    3:56: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):1077:1130 -> lookupSingleInterfaceTarget
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:470:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> <init>
+    471:510:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    511:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    556:556:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    557:943:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    944:962:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    963:978:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    979:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    986:986:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    987:1447:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    7:7:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1179:1181 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1172:1174 -> addSwitchMaps
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> assertNoItemRemoved
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> computeReachableInterfaces
+    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> filter
+    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> filter
+    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006:1045 -> findSingleTargetFromSubtypes
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> getEnumValueInfoMapFor
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> getFieldAccessInfoCollection
+    1:2:java.lang.Iterable getPinnedItems():824:825 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():856:857 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> getSwitchMapFor
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasLiveness():780:780 -> hasLiveness
+    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1061:1070 -> interfacesMayHaveDefaultFor
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> isFieldWrittenByFieldPutInstruction
+    1:3:boolean isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):726:728 -> isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers
+    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> isInstantiatedDirectly
+    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:684 -> isInstantiatedDirectlyOrIndirectly
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> isInstantiatedIndirectly
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> isLiveProgramType
+    1:20:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> isMethodPinnedDirectlyOrInAncestor
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> isPinned
+    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:734 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1078:1079 -> lookupSingleInterfaceTarget
+    3:56: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):1087:1140 -> lookupSingleInterfaceTarget
     57:57:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
-    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1129 -> lookupSingleInterfaceTarget
-    58:85:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1131:1158 -> 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):852:867 -> 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):865:865 -> 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):863:863 -> 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):861:861 -> 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):859:859 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:876 -> lookupSingleVirtualTarget
-    3:73: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):884:954 -> lookupSingleVirtualTarget
-    74:82: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):950:958 -> lookupSingleVirtualTarget
-    83:83:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:936 -> lookupSingleVirtualTarget
-    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):728:729 -> mayPropagateValueFor
-    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):963:970 -> nestAccessLookup
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):826:827 -> prunedCopyFrom
-    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):739:744 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):750:759 -> rewriteKeysConservativelyWhileMergingValues
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):832:833 -> rewrittenWithLense
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):841:842 -> wasPruned
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():776:776 -> withLiveness
-    1:19:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):583:601 -> withoutStaticFieldsWrites
-    20:20:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):599:599 -> withoutStaticFieldsWrites
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1139 -> lookupSingleInterfaceTarget
+    58:85:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1141:1168 -> lookupSingleInterfaceTarget
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> lookupSingleTarget
+    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> lookupSingleTarget
+    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> lookupSingleTarget
+    19:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871:871 -> lookupSingleTarget
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869:869 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):885:886 -> lookupSingleVirtualTarget
+    3:73: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):894:964 -> lookupSingleVirtualTarget
+    74:82: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):960:968 -> lookupSingleVirtualTarget
+    83:83: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):946:946 -> lookupSingleVirtualTarget
+    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:739 -> mayPropagateValueFor
+    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):973:980 -> nestAccessLookup
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> prunedCopyFrom
+    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> rewriteKeysConservativelyWhileMergingValues
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> rewrittenWithLense
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> wasPruned
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> withLiveness
+    1:19:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:611 -> withoutStaticFieldsWrites
+    20:20:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():857:857 -> <clinit>
+    1:1:void <clinit>():867:867 -> <clinit>
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):177:179 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.ClassInlineRule:
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> builder
@@ -51051,16 +51275,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):323:323 -> <init>
     2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):145:336 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1710 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> a
-    2:2:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574 -> a
-    3:3:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1575:1575 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    2:2:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1574 -> a
+    3:3:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1575:1575 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1575 -> a
-    5:12:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1576:1583 -> a
-    13:13:void lambda$markLibraryAndClasspathMethodOverriddesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
+    4:4:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1575 -> a
+    5:12:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1576:1583 -> a
+    13:13:void lambda$markLibraryAndClasspathMethodOverridesAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
     14:19:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):393:398 -> a
     20:20:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> a
     20:20:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):398 -> a
@@ -51071,40 +51295,40 @@
     31:31:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443:1443 -> a
     32:32:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
     32:32:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1443 -> a
-    33:33:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> a
-    34:34:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1796:1796 -> a
-    35:35:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1817:1817 -> a
-    36:36:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2068:2068 -> a
-    37:37:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2152:2152 -> a
-    38:38:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2157:2157 -> a
-    39:39:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2285:2285 -> a
-    40:40:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2306:2306 -> a
-    41:41:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311:2311 -> a
+    33:33:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1652:1652 -> a
+    34:34:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1795:1795 -> a
+    35:35:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1816:1816 -> a
+    36:36:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2089:2089 -> a
+    37:37:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2173:2173 -> a
+    38:38:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2178:2178 -> a
+    39:39:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2307:2307 -> a
+    40:40:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2328:2328 -> a
+    41:41:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333:2333 -> a
     42:42:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2311 -> a
-    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312:2312 -> a
+    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333 -> a
+    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334:2334 -> a
     44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312 -> a
-    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2313:2313 -> a
+    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334 -> a
+    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335:2335 -> a
     46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2312 -> a
-    47:47:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2333:2333 -> a
-    48:48:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2495:2495 -> a
-    49:49:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2503:2503 -> a
-    50:50:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> a
-    51:54:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3367:3370 -> a
-    55:55:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3389:3389 -> a
+    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334 -> a
+    47:47:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2355:2355 -> a
+    48:48:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2516:2516 -> a
+    49:49:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2524:2524 -> a
+    50:50:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$38(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> a
+    51:54:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$39(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):3437:3440 -> a
+    55:55:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459:3459 -> a
     56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    56:56:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3389 -> a
-    57:69:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3390:3402 -> a
-    70:70:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3396:3396 -> a
-    71:71:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3410:3410 -> a
+    56:56:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
+    57:69:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3460:3472 -> a
+    70:70:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$41(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3466:3466 -> a
+    71:71:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3480:3480 -> a
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    72:72:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3410 -> a
-    73:78:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3411:3416 -> a
-    79:79:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3413:3413 -> a
-    80:80:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3434:3434 -> a
-    81:85:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3442:3446 -> a
+    72:72:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3480 -> a
+    73:78:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3481:3486 -> a
+    79:79:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$42(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):3483:3483 -> a
+    80:80:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$43(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):3504:3504 -> a
+    81:85:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$44(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):3512:3516 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer$GraphReporter access$000(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$000
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$100
     1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> access$1000
@@ -51148,28 +51372,28 @@
     1:1:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> access$800
     1:1:java.util.Map access$900(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$900
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1692 -> b
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1691 -> b
     2:2:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1199:1199 -> b
     3:3:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1419:1419 -> b
-    4:4:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1654:1654 -> b
-    5:5:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1798:1798 -> b
-    6:6:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1895:1895 -> b
-    7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3378:3378 -> b
+    4:4:com.android.tools.r8.shaking.KeepReason lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1653:1653 -> b
+    5:5:com.android.tools.r8.shaking.KeepReason lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1797:1797 -> b
+    6:6:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1905:1905 -> b
+    7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3448:3448 -> b
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3378 -> b
-    9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3379:3381 -> b
+    8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3448 -> b
+    9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$40(com.android.tools.r8.graph.DexType):3449:3451 -> b
     1:1:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1278:1278 -> c
     2:2:com.android.tools.r8.shaking.KeepReason lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1415:1415 -> c
-    3:3:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1661:1661 -> c
+    3:3:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1660:1660 -> c
     1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):514:517 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2150:2165 -> createAppInfo
-    17:56:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2164:2203 -> createAppInfo
-    57:59:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2202:2204 -> createAppInfo
+    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2171:2186 -> createAppInfo
+    17:57:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2185:2225 -> createAppInfo
+    58:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2224:2226 -> createAppInfo
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1105:1105 -> d
-    2:2:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1663:1663 -> d
-    3:3:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2509:2509 -> d
+    2:2:com.android.tools.r8.shaking.KeepReason lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1662:1662 -> d
+    3:3:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2530:2530 -> d
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1124:1124 -> e
-    2:2:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2513:2513 -> e
+    2:2:com.android.tools.r8.shaking.KeepReason lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> e
     1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1256:1256 -> enqueueDependentItem
     1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):486:496 -> enqueueFirstNonSerializableClassInitializer
     12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> enqueueFirstNonSerializableClassInitializer
@@ -51190,16 +51414,17 @@
     5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1216:1220 -> ensureMethodsContinueToWidenAccess
     1:1:com.android.tools.r8.shaking.KeepReason lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):529:529 -> f
     2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1131:1131 -> f
-    1:32:com.android.tools.r8.graph.DexEncodedMethod findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1935:1966 -> findAndMarkResolutionTarget
+    1:38:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1951:1988 -> findAndMarkResolutionTarget
+    39:50:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1987:1998 -> findAndMarkResolutionTarget
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1154:1154 -> g
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2004:2008 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2007:2012 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3366:3366 -> getAnnotationGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3375:3375 -> getClassGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3358:3358 -> getEdgeInfo
-    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3362:3362 -> getEdgeInfo
-    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3407:3407 -> getFieldGraphNode
-    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3345:3354 -> getGraphNode
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2025:2029 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2028:2033 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):3436:3436 -> getAnnotationGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):3445:3445 -> getClassGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):3428:3428 -> getEdgeInfo
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3432:3432 -> getEdgeInfo
+    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):3477:3477 -> getFieldGraphNode
+    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):3415:3424 -> getGraphNode
     1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062:1062 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062 -> getInvokeSuperTarget
@@ -51207,8 +51432,8 @@
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
     7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1066 -> getInvokeSuperTarget
     8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1067:1072 -> getInvokeSuperTarget
-    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3429:3449 -> getKeepRuleGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3386:3386 -> getMethodGraphNode
+    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):3499:3519 -> getKeepRuleGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):3456:3456 -> getMethodGraphNode
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():341:341 -> getMode
     1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:413 -> getNonPinnedWrittenFields
     25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):409:409 -> getNonPinnedWrittenFields
@@ -51216,41 +51441,41 @@
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getProgramClassOrNull
     2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):354 -> getProgramClassOrNull
     3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):356:364 -> getProgramClassOrNull
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3341:3341 -> getSourceNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):3411:3411 -> getSourceNode
     1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1272 -> handleAnnotation
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> handleAnnotation
     4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1272 -> handleAnnotation
     5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1273:1286 -> handleAnnotation
     1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1327:1355 -> handleInvokeOfDirectTarget
     1:23:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1290:1312 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2648:2655 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2662 -> handleJavaLangClassNewInstance
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669:2676 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2683 -> handleJavaLangClassNewInstance
     18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2666 -> handleJavaLangClassNewInstance
-    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2668:2671 -> handleJavaLangClassNewInstance
-    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2818:2823 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2678:2698 -> handleJavaLangReflectConstructorNewInstance
-    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2697:2723 -> handleJavaLangReflectConstructorNewInstance
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2687 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2689:2692 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2839:2844 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2699:2719 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2718:2744 -> handleJavaLangReflectConstructorNewInstance
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2725 -> handleJavaLangReflectConstructorNewInstance
-    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2727:2771 -> handleJavaLangReflectConstructorNewInstance
-    1:28:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2781:2808 -> handleJavaLangReflectProxyNewProxyInstance
-    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2542:2548 -> handleReflectiveBehavior
-    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2593 -> handleReflectiveBehavior
+    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2746 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2748:2792 -> handleJavaLangReflectConstructorNewInstance
+    1:28:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2802:2829 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2563:2569 -> handleReflectiveBehavior
+    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2574:2614 -> handleReflectiveBehavior
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleReflectiveBehavior
-    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2594 -> handleReflectiveBehavior
-    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2595:2606 -> handleReflectiveBehavior
+    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2615 -> handleReflectiveBehavior
+    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2616:2627 -> handleReflectiveBehavior
     62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> handleReflectiveBehavior
-    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2606 -> handleReflectiveBehavior
-    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2615:2633 -> handleReflectiveBehavior
+    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2627 -> handleReflectiveBehavior
+    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2636:2654 -> handleReflectiveBehavior
     82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> handleReflectiveBehavior
-    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2633 -> handleReflectiveBehavior
-    83:87:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2637:2641 -> handleReflectiveBehavior
-    88:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2639:2639 -> handleReflectiveBehavior
-    89:89:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2638:2638 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2862:2874 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2829:2847 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2840:2856 -> handleServiceLoaderInvocation
+    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2654 -> handleReflectiveBehavior
+    83:87:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2658:2662 -> handleReflectiveBehavior
+    88:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2660:2660 -> handleReflectiveBehavior
+    89:89:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2659:2659 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2883:2895 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2850:2868 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861:2877 -> handleServiceLoaderInvocation
     1:2:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():378:379 -> instanceFieldsWrittenOnlyInEnclosingInstanceInitializers
     1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:448 -> internalEnqueueRootItem
     9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> internalEnqueueRootItem
@@ -51261,90 +51486,92 @@
     19:19:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):455 -> internalEnqueueRootItem
     20:35:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:471 -> internalEnqueueRootItem
     36:36:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):469:469 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1782:1782 -> isFieldLive
-    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1786:1786 -> isInstantiatedOrHasInstantiatedSubtype
-    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3336:3336 -> isNonProgramClass
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1781:1781 -> isFieldLive
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1785:1785 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3406:3406 -> isNonProgramClass
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isNonProgramClass
-    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3336 -> isNonProgramClass
-    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3337:3337 -> isNonProgramClass
+    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3406 -> isNonProgramClass
+    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):3407:3407 -> isNonProgramClass
     1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):350:350 -> isProgramClass
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2220:2225 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2524:2529 -> markClassAsInstantiatedWithCompatRule
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2242:2247 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2550 -> markClassAsInstantiatedWithCompatRule
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2530 -> markClassAsInstantiatedWithCompatRule
-    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2533 -> markClassAsInstantiatedWithCompatRule
-    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2531:2531 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2517:2519 -> markClassAsInstantiatedWithReason
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2551 -> markClassAsInstantiatedWithCompatRule
+    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2554 -> markClassAsInstantiatedWithCompatRule
+    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2552:2552 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2538:2540 -> markClassAsInstantiatedWithReason
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2519:2519 -> markClassAsInstantiatedWithReason
-    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1751:1763 -> markDirectStaticOrConstructorMethodAsLive
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2540:2540 -> markClassAsInstantiatedWithReason
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1750:1762 -> 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):1762 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2016:2022 -> markEnumValuesAsReachable
-    1:8:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2415:2422 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1653:1654 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1696:1701 -> markInstanceFieldAsLive
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2037:2043 -> markEnumValuesAsReachable
+    1:8:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2436:2443 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1652:1653 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1695:1700 -> 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):1701 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1703:1710 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1790:1792 -> markInstanceFieldAsReachable
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1700 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1702:1709 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1789:1791 -> 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):1792 -> markInstanceFieldAsReachable
-    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1795:1818 -> markInstanceFieldAsReachable
-    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714:1715 -> markInstantiated
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1791 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1794:1817 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1713:1714 -> 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.shaking.KeepReason):1715 -> markInstantiated
-    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1717:1717 -> markInstantiated
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1714 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1716:1716 -> markInstantiated
     1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):475:481 -> markInterfaceAsInstantiated
     1:25:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1226:1250 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1721:1721 -> markLambdaInstantiated
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1720:1720 -> markLambdaInstantiated
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1721 -> markLambdaInstantiated
-    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1723:1744 -> markLambdaInstantiated
-    1:9:void markLibraryAndClasspathMethodOverriddesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> markLibraryAndClasspathMethodOverriddesAsLive
-    1:29:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2376:2404 -> markMethodAsKept
-    30:39:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2401:2410 -> markMethodAsKept
-    1:12:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2468:2479 -> markMethodAsLive
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1720 -> markLambdaInstantiated
+    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1722:1743 -> markLambdaInstantiated
+    1:9:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1564:1572 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:29:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2397:2425 -> markMethodAsKept
+    30:39:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2422:2431 -> markMethodAsKept
+    1:12:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> markMethodAsLive
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2479 -> markMethodAsLive
-    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2481:2485 -> markMethodAsLive
-    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2484:2487 -> markMethodAsLive
-    23:29:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2486:2492 -> markMethodAsLive
+    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> markMethodAsLive
+    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> markMethodAsLive
+    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> markMethodAsLive
+    23:29:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2513 -> markMethodAsLive
     30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markMethodAsLive
-    30:30:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2492 -> markMethodAsLive
-    31:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2492:2503 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> markMethodAsLiveWithCompatRule
+    30:30:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2513 -> markMethodAsLive
+    31:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2513:2524 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2559:2559 -> markMethodAsLiveWithCompatRule
     1:14:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1409:1422 -> markMethodAsTargeted
     15:15:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
     15:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1422 -> markMethodAsTargeted
     16:20:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1424:1428 -> markMethodAsTargeted
     1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1323:1323 -> markNonStaticDirectMethodAsReachable
-    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2507:2511 -> markParameterAndReturnTypesAsLive
-    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1884 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> markPossibleTargetsAsReachable
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2528:2532 -> markParameterAndReturnTypesAsLive
+    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1894 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> markPossibleTargetsAsReachable
     2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> markPossibleTargetsAsReachable
-    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884 -> markPossibleTargetsAsReachable
-    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1884:1885 -> markPossibleTargetsAsReachable
-    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> markPossibleTargetsAsReachable
-    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1885 -> markPossibleTargetsAsReachable
-    6:49:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1885:1928 -> markPossibleTargetsAsReachable
-    50:50:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1911:1911 -> markPossibleTargetsAsReachable
-    1:16:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1983:1998 -> markPossiblyValidTarget
-    17:20:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1984:1987 -> markPossiblyValidTarget
-    21:27:com.android.tools.r8.graph.DexEncodedMethod markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):1986:1992 -> markPossiblyValidTarget
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1659:1677 -> markStaticFieldAsLive
+    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894 -> markPossibleTargetsAsReachable
+    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1894:1895 -> markPossibleTargetsAsReachable
+    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markPossibleTargetsAsReachable
+    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1895 -> markPossibleTargetsAsReachable
+    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1895:1941 -> markPossibleTargetsAsReachable
+    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1938:1944 -> markPossibleTargetsAsReachable
+    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1924 -> markPossibleTargetsAsReachable
+    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1921:1921 -> markPossibleTargetsAsReachable
+    1:16:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2006:2021 -> markPossiblyValidTarget
+    17:20:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2007:2010 -> markPossiblyValidTarget
+    21:29:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2009:2017 -> markPossiblyValidTarget
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1658:1676 -> 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):1677 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680:1681 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1676 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1679:1680 -> 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):1681 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1685:1692 -> markStaticFieldAsLive
-    1:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2032:2046 -> markSuperMethodAsReachable
-    16:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2045:2064 -> markSuperMethodAsReachable
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684:1691 -> markStaticFieldAsLive
+    1:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2053:2067 -> markSuperMethodAsReachable
+    16:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2066:2085 -> markSuperMethodAsReachable
     36:36:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2064 -> markSuperMethodAsReachable
-    37:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2067:2072 -> markSuperMethodAsReachable
+    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2085 -> markSuperMethodAsReachable
+    37:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2088:2093 -> markSuperMethodAsReachable
     1:15:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1091:1105 -> markTypeAsLive
     16:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1103:1103 -> markTypeAsLive
     17:32:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1110:1125 -> markTypeAsLive
@@ -51359,21 +51586,18 @@
     104:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204 -> markTypeAsLive
     105:105:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1204:1204 -> markTypeAsLive
     106:106:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1203:1203 -> markTypeAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1769:1773 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1771:1776 -> markVirtualMethodAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1768:1772 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1770:1775 -> 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):1776 -> markVirtualMethodAsLive
-    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1825:1825 -> markVirtualMethodAsReachable
-    2:3:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1833:1834 -> markVirtualMethodAsReachable
-    4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    4:4:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1834 -> markVirtualMethodAsReachable
-    5:13:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1836:1844 -> markVirtualMethodAsReachable
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markVirtualMethodAsReachable
-    14:14:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1844 -> markVirtualMethodAsReachable
-    15:38:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1846:1869 -> markVirtualMethodAsReachable
-    39:39:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():247:247 -> markVirtualMethodAsReachable
-    39:39:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1870 -> markVirtualMethodAsReachable
-    40:40:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1873:1873 -> markVirtualMethodAsReachable
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775 -> markVirtualMethodAsLive
+    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1824:1824 -> markVirtualMethodAsReachable
+    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1832:1859 -> markVirtualMethodAsReachable
+    30:30:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
+    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1859 -> markVirtualMethodAsReachable
+    31:50:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1863:1882 -> markVirtualMethodAsReachable
+    51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markVirtualMethodAsReachable
+    51:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1883 -> markVirtualMethodAsReachable
+    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886:1886 -> markVirtualMethodAsReachable
     1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():418:418 -> newSetWithoutReasonReporter
     1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1466:1478 -> populateInstantiatedTypesCache
     1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1266:1266 -> processAnnotation
@@ -51382,22 +51606,21 @@
     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.shaking.KeepReason):1452 -> processNewlyInstantiatedClass
     17:24:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1455:1462 -> processNewlyInstantiatedClass
-    1:2:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2109:2110 -> recordKeptGraph
+    1:2:com.android.tools.r8.experimental.graphinfo.GraphConsumer recordKeptGraph(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.experimental.graphinfo.GraphConsumer):2130:2131 -> recordKeptGraph
     1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):345:345 -> registerAnalysis
-    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3288:3291 -> registerAnnotation
-    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3281:3284 -> registerClass
+    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):3369:3372 -> registerAnnotation
+    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3362:3365 -> registerClass
     1:2:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1317:1318 -> registerClassInitializer
-    1:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3325:3332 -> registerEdge
-    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3318:3321 -> registerField
+    1:8:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):3395:3402 -> registerEdge
+    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3388:3391 -> registerField
     1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):544:545 -> registerFieldAccess
     3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):550:578 -> registerFieldAccess
     1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> registerFieldRead
     1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> registerFieldWrite
-    1:5:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3273:3277 -> registerInterface
-    1:7:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):3296:3302 -> registerMethod
-    8:16:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3306:3314 -> registerMethod
+    1:5:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3354:3358 -> registerInterface
+    1:9:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3376:3384 -> registerMethod
     1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):527:530 -> registerMethodWithTargetAndContext
-    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3266:3269 -> registerType
+    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness registerType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3347:3350 -> registerType
     1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1390:1391 -> 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):1391 -> reportMissingClass
@@ -51407,33 +51630,33 @@
     1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1396:1397 -> 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):1397 -> reportMissingMethod
-    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2428:2442 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2449:2463 -> shouldMarkLibraryMethodOverrideAsReachable
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2442 -> shouldMarkLibraryMethodOverrideAsReachable
-    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2447:2459 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3257:3262 -> skipReporting
+    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2463 -> shouldMarkLibraryMethodOverrideAsReachable
+    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2468:2480 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):3338:3343 -> skipReporting
     1:2:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():384:385 -> staticFieldsWrittenOnlyInEnclosingStaticInitializer
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2210:2215 -> toSortedDescriptorSet
-    1:39:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2231:2269 -> trace
-    40:40:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> trace
-    41:41:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2263 -> trace
-    42:42:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2260:2260 -> trace
-    43:43:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2256:2256 -> trace
-    44:44:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2253 -> trace
-    45:45:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2250:2250 -> trace
-    46:46:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2247:2247 -> trace
-    47:47:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2244:2244 -> trace
-    48:161:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2241:2354 -> trace
-    162:173:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2353:2364 -> trace
-    174:174:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2362:2362 -> trace
-    1:9:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2097:2105 -> traceApplication
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2081:2088 -> traceMainDex
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2232:2237 -> toSortedDescriptorSet
+    1:39:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2253:2291 -> trace
+    40:40:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2288 -> trace
+    41:41:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2285:2285 -> trace
+    42:42:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2282:2282 -> trace
+    43:43:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2278:2278 -> trace
+    44:44:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2275:2275 -> trace
+    45:45:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2272 -> trace
+    46:46:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2269:2269 -> trace
+    47:47:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2266:2266 -> trace
+    48:160:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2263:2375 -> trace
+    161:172:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2374:2385 -> trace
+    173:173:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2383:2383 -> trace
+    1:9:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2118:2126 -> traceApplication
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2102:2109 -> traceMainDex
     1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1594:1601 -> transitionDefaultMethodsForInstantiatedClass
-    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1643:1646 -> transitionDependentItemsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1642:1645 -> transitionDependentItemsForInstantiatedClass
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646 -> transitionDependentItemsForInstantiatedClass
-    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1648:1649 -> transitionDependentItemsForInstantiatedClass
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1628:1636 -> transitionFieldsForInstantiatedClass
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1645 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1647:1648 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1627:1635 -> transitionFieldsForInstantiatedClass
     1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1499:1520 -> transitionMethodsForInstantiatedClass
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
     23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1520 -> transitionMethodsForInstantiatedClass
@@ -51444,71 +51667,84 @@
     57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
     57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1554 -> transitionMethodsForInstantiatedClass
     58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1556:1556 -> transitionMethodsForInstantiatedClass
-    1:8:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1609:1616 -> transitionNonAbstractMethodsToLiveAndShadow
-    9:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason,com.android.tools.r8.shaking.ScopedDexMethodSet):1613:1613 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1607:1615 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1614:1614 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1611 -> transitionNonAbstractMethodsToLiveAndShadow
     1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1055:1057 -> transitionReachableVirtualMethods
-    1:5:void unpinLambdaMethods():2368:2372 -> unpinLambdaMethods
-    1:4:boolean verifyKeptGraph():2117:2120 -> verifyKeptGraph
+    1:5:void unpinLambdaMethods():2389:2393 -> unpinLambdaMethods
+    1:4:boolean verifyKeptGraph():2138:2141 -> verifyKeptGraph
     1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1080:1081 -> verifyMethodIsTargeted
-    1:19:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2127:2145 -> verifyRootedPath
+    1:19:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.CollectingGraphConsumer):2148:2166 -> verifyRootedPath
     1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1086:1086 -> verifyTypeIsLive
     1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):369:373 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():2239:2239 -> <clinit>
+    1:1:void <clinit>():2261:2261 -> <clinit>
     2:2:void <clinit>():990:990 -> <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):2960:2960 -> <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):2967:2970 -> <init>
-    1:1:boolean addField(com.android.tools.r8.graph.DexField):2980:2980 -> 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):3017:3017 -> <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):3024:3027 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3037:3037 -> addField
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):2980 -> addField
-    3:13:boolean addField(com.android.tools.r8.graph.DexField):2984:2994 -> addField
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> addField
-    14:14:boolean addField(com.android.tools.r8.graph.DexField):2994 -> addField
-    15:27:boolean addField(com.android.tools.r8.graph.DexField):2994:3006 -> addField
-    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3014:3023 -> addMethod
-    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3022:3029 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3059:3060 -> addType
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3037 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3041:3051 -> addField
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> addField
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3051 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3051:3063 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3071:3080 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3079:3086 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3116:3117 -> addType
 com.android.tools.r8.shaking.Enqueuer$GraphReporter -> com.android.tools.r8.shaking.Enqueuer$GraphReporter:
-    1:1:void <clinit>():3066:3066 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3066:3066 -> <init>
-    1:1:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3066:3066 -> access$3800
-    1:1:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3066:3066 -> access$3900
-    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3179:3184 -> reportClassReferencedFrom
-    7:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3189:3194 -> reportClassReferencedFrom
-    1:8:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3198:3205 -> reportCompanionClass
-    9:9:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3203:3203 -> reportCompanionClass
-    1:7:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3211:3217 -> reportCompanionMethod
-    8:8:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> reportCompanionMethod
-    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3168:3171 -> reportCompatInstantiated
-    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3169:3174 -> reportCompatInstantiated
-    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3145:3146 -> reportCompatKeepDefaultInitializer
+    1:1:void <clinit>():3123:3123 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):3123:3123 -> <init>
+    1:1:com.android.tools.r8.shaking.KeepReason access$3800(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3123:3123 -> access$3800
+    1:1:com.android.tools.r8.shaking.KeepReason access$3900(com.android.tools.r8.shaking.Enqueuer$GraphReporter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3123:3123 -> access$3900
+    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3236:3241 -> reportClassReferencedFrom
+    7:12:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):3246:3251 -> reportClassReferencedFrom
+    1:8:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3278:3285 -> reportCompanionClass
+    9:9:com.android.tools.r8.shaking.KeepReason reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):3283:3283 -> reportCompanionClass
+    1:7:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3291:3297 -> reportCompanionMethod
+    8:8:com.android.tools.r8.shaking.KeepReason reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):3295:3295 -> reportCompanionMethod
+    1:4:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3225:3228 -> reportCompatInstantiated
+    5:10:com.android.tools.r8.shaking.KeepReason reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3226:3231 -> reportCompatInstantiated
+    1:2:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3202:3203 -> reportCompatKeepDefaultInitializer
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> reportCompatKeepDefaultInitializer
-    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146 -> reportCompatKeepDefaultInitializer
-    4:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146:3146 -> reportCompatKeepDefaultInitializer
+    3:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203 -> reportCompatKeepDefaultInitializer
+    4:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203:3203 -> reportCompatKeepDefaultInitializer
     5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> reportCompatKeepDefaultInitializer
-    5:5:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3146 -> reportCompatKeepDefaultInitializer
-    6:9:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3147:3150 -> reportCompatKeepDefaultInitializer
-    10:15:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3148:3153 -> reportCompatKeepDefaultInitializer
-    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> reportCompatKeepMethod
-    1:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3223:3225 -> reportEdge
-    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3080:3085 -> reportKeepClass
-    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3090:3096 -> reportKeepClass
-    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3124:3129 -> reportKeepField
-    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3134:3140 -> reportKeepField
-    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3101:3106 -> reportKeepMethod
-    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3113:3119 -> reportKeepMethod
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3069:3075 -> reportPrecondition
+    5:5:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3203 -> reportCompatKeepDefaultInitializer
+    6:9:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3204:3207 -> reportCompatKeepDefaultInitializer
+    10:15:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3205:3210 -> reportCompatKeepDefaultInitializer
+    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):3215:3220 -> reportCompatKeepMethod
+    1:3:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):3303:3305 -> reportEdge
+    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):3137:3142 -> reportKeepClass
+    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):3147:3153 -> reportKeepClass
+    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):3181:3186 -> reportKeepField
+    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):3191:3197 -> reportKeepField
+    1:6:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):3158:3163 -> reportKeepMethod
+    7:13:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):3170:3176 -> reportKeepMethod
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):3126:3132 -> reportPrecondition
+    1:4:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3256:3259 -> reportReachableMethodAsLive
+    5:10:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3257:3262 -> reportReachableMethodAsLive
+    11:18:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):3267:3274 -> reportReachableMethodAsLive
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness -> com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness:
-    1:2:void <clinit>():3236:3237 -> <clinit>
-    1:1:void <init>():3234:3234 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3234:3234 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3234:3234 -> access$4700
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3234:3234 -> access$4800
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3247:3247 -> edgeKind
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3252:3252 -> getSourceNode
+    1:2:void <clinit>():3317:3318 -> <clinit>
+    1:1:void <init>():3315:3315 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3315:3315 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4700():3315:3315 -> access$4700
+    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness access$4800():3315:3315 -> access$4800
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():3328:3328 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):3333:3333 -> getSourceNode
 com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness$1 -> com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness$1:
-    1:1:void <init>():3238:3238 -> <init>
+    1:1:void <init>():3319:3319 -> <init>
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
+    1:3:void <clinit>():2924:2926 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2935:2938 -> <init>
+    1:2:boolean equals(java.lang.Object):2954:2955 -> equals
+    1:1:int hashCode():2948:2948 -> hashCode
+    2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
+    2:2:int hashCode():2948 -> hashCode
+    1:1:boolean isUnresolved():2942:2942 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
     1:4:void <clinit>():120:123 -> <clinit>
     5:5:void <clinit>():119:119 -> <clinit>
@@ -51519,28 +51755,27 @@
     1:1:boolean isTracingMainDex():138:138 -> isTracingMainDex
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):119:119 -> valueOf
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():119:119 -> values
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
+    1:3:void <init>():2959:2961 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2959:2959 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2972:2979 -> add
+    1:1:java.util.Set getMethods():2964:2964 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2968:2968 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):2885:2885 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2881:2886 -> <init>
-    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2879:2879 -> access$3700
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2890:2891 -> add
-    1:1:boolean contains(java.lang.Object):2895:2895 -> contains
-    1:1:java.util.Set getItems():2899:2899 -> getItems
-com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason -> com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason:
-    1:2:void <init>(java.util.function.BiConsumer,java.util.Map):2913:2914 -> <init>
-    1:1:java.util.Set lambda$register$0(java.lang.Object):2919:2919 -> a
-    2:2:void lambda$register$1(java.util.Map,java.lang.Object,com.android.tools.r8.shaking.KeepReason):2919:2919 -> a
-    1:2:com.android.tools.r8.shaking.Enqueuer$SetWithStoredReason create():2907:2908 -> create
-    1:1:java.util.Set getReasons(java.lang.Object):2923:2923 -> getReasons
-    1:1:java.util.function.BiConsumer register(java.util.Map):2918:2918 -> register
+    1:1:void <init>(java.util.function.BiConsumer):2906:2906 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2902:2907 -> <init>
+    1:1:java.util.Set access$3700(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2900:2900 -> access$3700
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2911:2912 -> add
+    1:1:boolean contains(java.lang.Object):2916:2916 -> contains
+    1:1:java.util.Set getItems():2920:2920 -> getItems
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2932:2934 -> <init>
-    1:5:boolean equals(java.lang.Object):2952:2956 -> equals
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():2942:2942 -> getContext
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():2938:2938 -> getTarget
-    1:1:int hashCode():2947:2947 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2989:2991 -> <init>
+    1:5:boolean equals(java.lang.Object):3009:3013 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():2999:2999 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():2995:2995 -> getTarget
+    1:1:int hashCode():3004:3004 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2947 -> hashCode
+    2:2:int hashCode():3004 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.shaking.Enqueuer$UseRegistry:
     1:1:void <clinit>():581:581 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):581:581 -> <init>
@@ -51727,75 +51962,71 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):32:32 -> invokedViaSuperFrom
     1:1:com.android.tools.r8.shaking.KeepReason isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> isLibraryMethod
     1:1:com.android.tools.r8.shaking.KeepReason methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> methodHandleReferencedIn
-    1:1:com.android.tools.r8.shaking.KeepReason overridesMethod(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> overridesMethod
     1:1:com.android.tools.r8.shaking.KeepReason reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> reachableFromLiveType
     1:1:com.android.tools.r8.shaking.KeepReason referencedInAnnotation(com.android.tools.r8.graph.DexItem):56:56 -> referencedInAnnotation
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> reflectiveUseIn
     1:1:com.android.tools.r8.shaking.KeepReason targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> targetedBySuperFrom
 com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.KeepReason$AnnotatedOn:
-    1:1:void <clinit>():304:304 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):304:304 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):308:309 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():314:314 -> edgeKind
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):319:325 -> getSourceNode
+    1:1:void <clinit>():283:283 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):283:283 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):287:288 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():293:293 -> edgeKind
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):298:304 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):95:95 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):99:100 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():106:106 -> getMethod
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> getSourceNode
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):91:91 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):95:96 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():102:102 -> getMethod
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):107:107 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.shaking.KeepReason$InstatiatedIn:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):132:132 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> edgeKind
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():132:132 -> getMethod
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):132:132 -> getSourceNode
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):111:111 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):114:114 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():129:129 -> edgeKind
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():111:111 -> getMethod
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):111:111 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.KeepReason$InvokedFrom:
-    1:1:void <clinit>():193:193 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):193:193 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():202:202 -> edgeKind
+    1:1:void <clinit>():172:172 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):172:172 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):175:176 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():181:181 -> edgeKind
 com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):211:211 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):214:214 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():219:219 -> edgeKind
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):190:190 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):193:193 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():198:198 -> edgeKind
 com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.KeepReason$InvokedViaSuper:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):159:159 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):162:162 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():167:167 -> edgeKind
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):138:138 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():146:146 -> edgeKind
 com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.shaking.KeepReason$IsLibraryMethod:
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):269:271 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():276:276 -> edgeKind
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):281:281 -> getSourceNode
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):352:352 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():360:360 -> edgeKind
-com.android.tools.r8.shaking.KeepReason$OverridesMethod -> com.android.tools.r8.shaking.KeepReason$OverridesMethod:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():123:123 -> edgeKind
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType:
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):245:245 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType):249:250 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):243:243 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):248:250 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():255:255 -> edgeKind
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):260:260 -> getSourceNode
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):331:331 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):334:334 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():339:339 -> edgeKind
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType:
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):224:224 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):228:229 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():234:234 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):239:239 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.KeepReason$ReferencedFrom:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):228:228 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):231:231 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():236:236 -> edgeKind
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):207:207 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):210:210 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():215:215 -> edgeKind
 com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation:
-    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):285:285 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexItem):289:290 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():295:295 -> edgeKind
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):300:300 -> getSourceNode
+    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):264:264 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):268:269 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():274:274 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer):279:279 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):330:330 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):333:333 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():343:343 -> edgeKind
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():322:322 -> edgeKind
 com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.KeepReason$TargetedBySuper:
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):179:179 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():184:184 -> edgeKind
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):155:155 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):158:158 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():163:163 -> edgeKind
 com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.shaking.L8TreePruner:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):32:32 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):28:36 -> <init>
@@ -52308,7 +52539,7 @@
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():155:156 -> getConfig
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():164:165 -> getConfigRawForTesting
     1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():123:123 -> getConfigurationBuilder
-    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):1994:2000 -> getTextSourceSnippet
+    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2010:2016 -> getTextSourceSnippet
     1:1:void parse(java.nio.file.Path):169:169 -> parse
     2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):173:173 -> parse
     3:10:void parse(java.util.List):177:184 -> parse
@@ -52319,13 +52550,13 @@
     8:10:void validate():130 -> validate
     11:22:void validate():135:146 -> 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):2008:2010 -> <init>
-    1:2:boolean hasBackreference():2022:2023 -> hasBackreference
-    1:15:boolean hasUnusualCharacters():2027:2041 -> hasUnusualCharacters
-    1:1:boolean isMatchAllNames():2018:2018 -> isMatchAllNames
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2014:2014 -> withoutWildcards
+    1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
+    1:2:boolean hasBackreference():2038:2039 -> hasBackreference
+    1:15:boolean hasUnusualCharacters():2043:2057 -> hasUnusualCharacters
+    1:1:boolean isMatchAllNames():2034:2034 -> isMatchAllNames
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> 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):2052:2054 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType:
     1:3:void <clinit>():191:193 -> <clinit>
     4:4:void <clinit>():190:190 -> <clinit>
@@ -52335,199 +52566,200 @@
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser:
     1:1:void <clinit>():196:196 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):206:206 -> <init>
-    2:1368:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1565 -> <init>
-    1369:1372:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
-    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1314:1317 -> a
-    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1540:1540 -> a
-    6:8:boolean lambda$acceptPattern$7(java.lang.Integer):1757:1759 -> a
-    1:7:boolean acceptArobaseInclude():524:530 -> acceptArobaseInclude
-    1:2:boolean acceptChar(char):1474:1475 -> acceptChar
-    1:1:java.lang.String acceptClassName():1573:1573 -> acceptClassName
-    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1705:1726 -> acceptFieldNameOrIntegerForReturn
-    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1578:1583 -> acceptIdentifierWithBackreference
-    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1588:1614 -> acceptIdentifierWithBackreference
-    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609:1610 -> acceptIdentifierWithBackreference
+    2:1384:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):199:1581 -> <init>
+    1385:1388:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):208:211 -> <init>
+    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1330:1333 -> a
+    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1556:1556 -> a
+    6:8:boolean lambda$acceptPattern$7(java.lang.Integer):1773:1775 -> a
+    1:7:boolean acceptArobaseInclude():529:535 -> acceptArobaseInclude
+    1:2:boolean acceptChar(char):1490:1491 -> acceptChar
+    1:1:java.lang.String acceptClassName():1589:1589 -> acceptClassName
+    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1721:1742 -> acceptFieldNameOrIntegerForReturn
+    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1594:1599 -> acceptIdentifierWithBackreference
+    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1604:1630 -> acceptIdentifierWithBackreference
+    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625:1626 -> acceptIdentifierWithBackreference
     36:38:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1609 -> acceptIdentifierWithBackreference
-    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617:1619 -> acceptIdentifierWithBackreference
+    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1625 -> acceptIdentifierWithBackreference
+    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633:1635 -> acceptIdentifierWithBackreference
     42:44:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1617 -> acceptIdentifierWithBackreference
-    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1623:1629 -> acceptIdentifierWithBackreference
+    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1633 -> acceptIdentifierWithBackreference
+    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1639:1645 -> acceptIdentifierWithBackreference
     52:54:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1628 -> acceptIdentifierWithBackreference
-    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1640:1683 -> acceptIdentifierWithBackreference
+    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1644 -> acceptIdentifierWithBackreference
+    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1699 -> acceptIdentifierWithBackreference
     99:101:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1679 -> acceptIdentifierWithBackreference
-    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1673:1673 -> acceptIdentifierWithBackreference
-    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1668:1695 -> acceptIdentifierWithBackreference
+    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1695 -> acceptIdentifierWithBackreference
+    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1689:1689 -> acceptIdentifierWithBackreference
+    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1684:1711 -> acceptIdentifierWithBackreference
     131:133:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1694 -> acceptIdentifierWithBackreference
-    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1700:1701 -> acceptIdentifierWithBackreference
-    1:5:java.lang.Integer acceptInteger():1548:1552 -> acceptInteger
-    1:1:java.lang.String acceptPattern():1755:1755 -> acceptPattern
-    1:20:java.util.List acceptPatternList():1730:1749 -> acceptPatternList
-    1:1:char acceptQuoteIfPresent():1483:1483 -> acceptQuoteIfPresent
-    1:4:java.lang.String acceptQuotedOrUnquotedString():1539:1542 -> acceptQuotedOrUnquotedString
-    1:9:boolean acceptString(java.lang.String):1522:1530 -> acceptString
-    10:10:java.lang.String acceptString():1535:1535 -> acceptString
-    11:25:java.lang.String acceptString(java.util.function.Predicate):1763:1777 -> acceptString
-    1:1:boolean lambda$acceptString$3(java.lang.Integer):1535:1535 -> b
-    1:7:boolean lambda$new$5(java.lang.Integer):1557:1563 -> c
-    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1227:1236 -> checkConstructorPattern
-    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1233:1233 -> checkConstructorPattern
-    1:4:boolean lambda$new$6(java.lang.Integer):1567:1570 -> d
-    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1372:1373 -> e
-    1:1:boolean eof():1448:1448 -> eof
-    2:2:boolean eof(int):1452:1452 -> eof
-    1:2:void expectChar(char):1516:1517 -> expectChar
-    1:5:void expectClosingQuote(char):1487:1491 -> expectClosingQuote
-    6:6:void expectClosingQuote(char):1489:1489 -> expectClosingQuote
-    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):611:611 -> f
-    1:1:int getColumn():1983:1983 -> getColumn
-    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1971:1974 -> getPosition
-    5:5:com.android.tools.r8.position.TextPosition getPosition():1979:1979 -> getPosition
-    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):1987:1988 -> getSourceSnippet
-    1:4:boolean hasNextChar(char):1456:1459 -> hasNextChar
-    5:8:boolean hasNextChar(java.util.function.Predicate):1463:1466 -> hasNextChar
-    1:2:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1967 -> infoIgnoringModifier
-    3:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1966:1966 -> infoIgnoringModifier
-    1:2:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1942 -> infoIgnoringOptions
-    3:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1941:1941 -> infoIgnoringOptions
-    1:2:boolean isInteger(java.lang.String):1439:1440 -> isInteger
-    1:1:boolean isOptionalArgumentGiven():1470:1470 -> isOptionalArgumentGiven
+    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1710 -> acceptIdentifierWithBackreference
+    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1716:1717 -> acceptIdentifierWithBackreference
+    1:5:java.lang.Integer acceptInteger():1564:1568 -> acceptInteger
+    1:1:java.lang.String acceptPattern():1771:1771 -> acceptPattern
+    1:20:java.util.List acceptPatternList():1746:1765 -> acceptPatternList
+    1:1:char acceptQuoteIfPresent():1499:1499 -> acceptQuoteIfPresent
+    1:4:java.lang.String acceptQuotedOrUnquotedString():1555:1558 -> acceptQuotedOrUnquotedString
+    1:9:boolean acceptString(java.lang.String):1538:1546 -> acceptString
+    10:10:java.lang.String acceptString():1551:1551 -> acceptString
+    11:25:java.lang.String acceptString(java.util.function.Predicate):1779:1793 -> acceptString
+    1:1:boolean lambda$acceptString$3(java.lang.Integer):1551:1551 -> b
+    1:7:boolean lambda$new$5(java.lang.Integer):1573:1579 -> c
+    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1243:1252 -> checkConstructorPattern
+    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1249:1249 -> checkConstructorPattern
+    1:4:boolean lambda$new$6(java.lang.Integer):1583:1586 -> d
+    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1388:1389 -> e
+    1:1:boolean eof():1464:1464 -> eof
+    2:2:boolean eof(int):1468:1468 -> eof
+    1:2:void expectChar(char):1532:1533 -> expectChar
+    1:5:void expectClosingQuote(char):1503:1507 -> expectClosingQuote
+    6:6:void expectClosingQuote(char):1505:1505 -> expectClosingQuote
+    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):616:616 -> f
+    1:1:int getColumn():1999:1999 -> getColumn
+    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):1987:1990 -> getPosition
+    5:5:com.android.tools.r8.position.TextPosition getPosition():1995:1995 -> getPosition
+    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2003:2004 -> getSourceSnippet
+    1:4:boolean hasNextChar(char):1472:1475 -> hasNextChar
+    5:8:boolean hasNextChar(java.util.function.Predicate):1479:1482 -> hasNextChar
+    1:2:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1983 -> infoIgnoringModifier
+    3:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1982 -> infoIgnoringModifier
+    1:2:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1958 -> infoIgnoringOptions
+    3:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> infoIgnoringOptions
+    1:2:boolean isInteger(java.lang.String):1455:1456 -> isInteger
+    1:1:boolean isOptionalArgumentGiven():1486:1486 -> isOptionalArgumentGiven
     1:4:void parse():216:219 -> parse
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():870:882 -> parseAnnotation
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():881:881 -> parseAnnotation
-    1:12:java.util.List parseArgumentList():1242:1253 -> parseArgumentList
-    13:22:java.util.List parseArgumentList():1250:1259 -> parseArgumentList
-    23:25:java.util.List parseArgumentList():1258:1260 -> parseArgumentList
-    26:33:java.util.List parseArgumentList():1257:1264 -> parseArgumentList
-    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1395:1400 -> parseAssumeMayHaveSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1382:1389 -> parseAssumeNoSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1405:1412 -> parseAssumeValuesRule
-    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):658:665 -> parseCheckDiscardRule
-    1:6:void parseClassFilter(java.util.function.Consumer):1809:1814 -> parseClassFilter
-    7:7:void parseClassFilter(java.util.function.Consumer):1813:1813 -> parseClassFilter
-    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):895:917 -> parseClassFlagsAndAnnotations
-    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):671:676 -> parseClassInlineRule
-    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):682:687 -> parseClassMergingRule
-    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1841:1843 -> parseClassName
-    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1848:1851 -> parseClassName
-    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1820:1823 -> parseClassNameAddToBuilder
-    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1821:1824 -> parseClassNameAddToBuilder
-    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1828:1832 -> parseClassNames
-    1:10:java.util.List parseClassPath():1334:1343 -> parseClassPath
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1349:1362 -> parseClassPathFilters
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1359:1364 -> parseClassPathFilters
-    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):803:807 -> parseClassSpec
-    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):930:949 -> parseClassType
-    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):925:926 -> parseClassTypeUnexpected
-    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):755:760 -> parseConstantArgumentRule
-    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1921:1921 -> parseError
-    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):1925:1925 -> parseError
-    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1931:1932 -> parseError
-    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1936:1937 -> parseError
-    1:7:java.lang.String parseFileFilter():1369:1375 -> parseFileFilter
-    1:22:java.nio.file.Path parseFileName(boolean):1304:1325 -> parseFileName
-    23:30:java.nio.file.Path parseFileName(boolean):1323:1330 -> parseFileName
-    31:31:java.nio.file.Path parseFileName(boolean):1319:1319 -> parseFileName
-    32:32:java.nio.file.Path parseFileName(boolean):1308:1308 -> parseFileName
-    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):718:725 -> parseIdentifierNameStringRule
-    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):730:749 -> parseIfRule
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():886:898 -> parseAnnotation
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():897:897 -> parseAnnotation
+    1:12:java.util.List parseArgumentList():1258:1269 -> parseArgumentList
+    13:22:java.util.List parseArgumentList():1266:1275 -> parseArgumentList
+    23:25:java.util.List parseArgumentList():1274:1276 -> parseArgumentList
+    26:33:java.util.List parseArgumentList():1273:1280 -> parseArgumentList
+    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1411:1416 -> parseAssumeMayHaveSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1398:1405 -> parseAssumeNoSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1421:1428 -> parseAssumeValuesRule
+    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):663:670 -> parseCheckDiscardRule
+    1:6:void parseClassFilter(java.util.function.Consumer):1825:1830 -> parseClassFilter
+    7:7:void parseClassFilter(java.util.function.Consumer):1829:1829 -> parseClassFilter
+    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):911:933 -> parseClassFlagsAndAnnotations
+    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):676:681 -> parseClassInlineRule
+    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):687:692 -> parseClassMergingRule
+    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1857:1859 -> parseClassName
+    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1864:1867 -> parseClassName
+    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1836:1839 -> parseClassNameAddToBuilder
+    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1837:1840 -> parseClassNameAddToBuilder
+    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1844:1848 -> parseClassNames
+    1:10:java.util.List parseClassPath():1350:1359 -> parseClassPath
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1365:1378 -> parseClassPathFilters
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1375:1380 -> parseClassPathFilters
+    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):819:823 -> parseClassSpec
+    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):946:965 -> parseClassType
+    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):941:942 -> parseClassTypeUnexpected
+    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):760:765 -> parseConstantArgumentRule
+    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1937:1937 -> parseError
+    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):1941:1941 -> parseError
+    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1947:1948 -> parseError
+    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1952:1953 -> parseError
+    1:7:java.lang.String parseFileFilter():1385:1391 -> parseFileFilter
+    1:22:java.nio.file.Path parseFileName(boolean):1320:1341 -> parseFileName
+    23:30:java.nio.file.Path parseFileName(boolean):1339:1346 -> parseFileName
+    31:31:java.nio.file.Path parseFileName(boolean):1335:1335 -> parseFileName
+    32:32:java.nio.file.Path parseFileName(boolean):1324:1324 -> parseFileName
+    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):723:730 -> parseIdentifierNameStringRule
+    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):735:754 -> parseIfRule
     21:23:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> parseIfRule
-    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):748 -> parseIfRule
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):500:502 -> parseIgnoredOption
-    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):501:505 -> parseIgnoredOption
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):481:488 -> parseIgnoredOptionAndWarn
-    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):487:495 -> parseIgnoredOptionAndWarn
-    1:10:void parseInclude():509:518 -> parseInclude
-    11:11:void parseInclude():515:515 -> parseInclude
-    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):955:965 -> parseInheritance
-    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):964:964 -> parseInheritance
-    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):704:712 -> parseInlineRule
-    1:5:void parseKeepAttributes():535:539 -> parseKeepAttributes
-    6:6:void parseKeepAttributes():537:537 -> parseKeepAttributes
-    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):623:633 -> parseKeepRule
-    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):632:641 -> parseKeepRule
-    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):997:1046 -> parseMemberAccessFlags
-    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1034:1051 -> parseMemberAccessFlags
-    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1025:1030 -> parseMemberAccessFlags
-    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1020:1021 -> parseMemberAccessFlags
-    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1015:1016 -> parseMemberAccessFlags
-    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1010:1011 -> parseMemberAccessFlags
-    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1005:1061 -> parseMemberAccessFlags
-    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1069:1114 -> parseMemberPattern
-    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1109:1125 -> parseMemberPattern
-    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1120:1142 -> parseMemberPattern
-    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1141:1155 -> parseMemberPattern
-    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1154:1186 -> parseMemberPattern
-    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1185:1185 -> parseMemberPattern
-    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1183:1195 -> parseMemberPattern
-    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1194:1194 -> parseMemberPattern
-    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1193:1198 -> parseMemberPattern
-    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1197:1220 -> parseMemberPattern
-    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):987:992 -> parseMemberRule
-    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):974:981 -> parseMemberRules
-    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):694:699 -> parseMemberValuePropagationRule
-    1:2:boolean parseNegation():888:889 -> parseNegation
-    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):595:603 -> parseOptimizationOption
+    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):753 -> parseIfRule
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):505:507 -> parseIgnoredOption
+    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):506:510 -> parseIgnoredOption
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):486:493 -> parseIgnoredOptionAndWarn
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):492:500 -> parseIgnoredOptionAndWarn
+    1:10:void parseInclude():514:523 -> parseInclude
+    11:11:void parseInclude():520:520 -> parseInclude
+    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):971:981 -> parseInheritance
+    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):980:980 -> parseInheritance
+    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):709:717 -> parseInlineRule
+    1:5:void parseKeepAttributes():540:544 -> parseKeepAttributes
+    6:6:void parseKeepAttributes():542:542 -> parseKeepAttributes
+    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):628:638 -> parseKeepRule
+    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):637:646 -> parseKeepRule
+    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1013:1062 -> parseMemberAccessFlags
+    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1050:1067 -> parseMemberAccessFlags
+    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1041:1046 -> parseMemberAccessFlags
+    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1036:1037 -> parseMemberAccessFlags
+    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1031:1032 -> parseMemberAccessFlags
+    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1026:1027 -> parseMemberAccessFlags
+    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1021:1077 -> parseMemberAccessFlags
+    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1085:1130 -> parseMemberPattern
+    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1125:1141 -> parseMemberPattern
+    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1136:1158 -> parseMemberPattern
+    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1157:1171 -> parseMemberPattern
+    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1170:1202 -> parseMemberPattern
+    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1201:1201 -> parseMemberPattern
+    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1199:1211 -> parseMemberPattern
+    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1210:1210 -> parseMemberPattern
+    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209:1214 -> parseMemberPattern
+    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1213:1236 -> parseMemberPattern
+    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1003:1008 -> parseMemberRule
+    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):990:997 -> parseMemberRules
+    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):699:704 -> parseMemberValuePropagationRule
+    1:2:boolean parseNegation():904:905 -> parseNegation
+    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):600:608 -> parseOptimizationOption
     1:48:boolean parseOption():223:270 -> parseOption
     49:50:boolean parseOption():267:268 -> parseOption
     51:53:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> parseOption
     51:53:boolean parseOption():267 -> parseOption
     54:136:boolean parseOption():271:353 -> parseOption
     137:186:boolean parseOption():352:401 -> parseOption
-    1:10:void parsePackageFilter(java.util.function.BiConsumer):1790:1799 -> parsePackageFilter
-    11:14:void parsePackageFilter(java.util.function.BiConsumer):1798:1801 -> parsePackageFilter
-    15:22:void parsePackageFilter(java.util.function.BiConsumer):1796:1803 -> parsePackageFilter
-    1:1:java.lang.String parsePackageNameOrEmptyString():1836:1836 -> parsePackageNameOrEmptyString
-    1:5:void parsePathFilter(java.util.function.Consumer):1862:1866 -> parsePathFilter
-    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1871:1890 -> parsePathFilter
-    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1892 -> parsePathFilter
-    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1877:1877 -> parsePathFilter
-    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):848:865 -> parseRuleModifiers
-    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):811:844 -> parseRuleTypeAndModifiers
-    1:44:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):408:451 -> parseTestingOption
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):470:473 -> parseUnsupportedOptionAndErr
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):472:472 -> parseUnsupportedOptionAndErr
-    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):766:771 -> parseUnusedArgumentRule
-    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):646:653 -> parseWhyAreYouKeepingRule
-    1:1:boolean pathFilterMatcher(java.lang.Integer):1857:1857 -> pathFilterMatcher
-    1:1:char peekChar():1499:1499 -> peekChar
-    1:2:char peekCharAt(int):1503:1504 -> peekCharAt
-    1:1:char readChar():1508:1508 -> readChar
-    1:1:int remainingChars():1512:1512 -> remainingChars
-    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1270:1290 -> replaceSystemPropertyReferences
-    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1288:1300 -> replaceSystemPropertyReferences
-    1:8:void skipComment():1427:1434 -> skipComment
-    1:3:boolean skipFlag(java.lang.String):543:545 -> skipFlag
-    1:4:void skipOptimizationName():608:611 -> skipOptimizationName
-    1:10:boolean skipOptionWithClassSpec(java.lang.String):578:587 -> skipOptionWithClassSpec
+    1:10:void parsePackageFilter(java.util.function.BiConsumer):1806:1815 -> parsePackageFilter
+    11:14:void parsePackageFilter(java.util.function.BiConsumer):1814:1817 -> parsePackageFilter
+    15:22:void parsePackageFilter(java.util.function.BiConsumer):1812:1819 -> parsePackageFilter
+    1:1:java.lang.String parsePackageNameOrEmptyString():1852:1852 -> parsePackageNameOrEmptyString
+    1:5:void parsePathFilter(java.util.function.Consumer):1878:1882 -> parsePathFilter
+    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1887:1906 -> parsePathFilter
+    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1903:1908 -> parsePathFilter
+    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1893:1893 -> parsePathFilter
+    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):864:881 -> parseRuleModifiers
+    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):827:860 -> parseRuleTypeAndModifiers
+    1:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):408:456 -> parseTestingOption
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):475:478 -> parseUnsupportedOptionAndErr
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):477:477 -> parseUnsupportedOptionAndErr
+    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):771:776 -> parseUnusedArgumentRule
+    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):651:658 -> parseWhyAreYouKeepingRule
+    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):782:787 -> parseWhyAreYouNotInliningRule
+    1:1:boolean pathFilterMatcher(java.lang.Integer):1873:1873 -> pathFilterMatcher
+    1:1:char peekChar():1515:1515 -> peekChar
+    1:2:char peekCharAt(int):1519:1520 -> peekCharAt
+    1:1:char readChar():1524:1524 -> readChar
+    1:1:int remainingChars():1528:1528 -> remainingChars
+    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1286:1306 -> replaceSystemPropertyReferences
+    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1304:1316 -> replaceSystemPropertyReferences
+    1:8:void skipComment():1443:1450 -> skipComment
+    1:3:boolean skipFlag(java.lang.String):548:550 -> skipFlag
+    1:4:void skipOptimizationName():613:616 -> skipOptimizationName
+    1:10:boolean skipOptionWithClassSpec(java.lang.String):583:592 -> skipOptionWithClassSpec
     11:13:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80:82 -> skipOptionWithClassSpec
-    11:13:boolean skipOptionWithClassSpec(java.lang.String):587 -> skipOptionWithClassSpec
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):564:570 -> skipOptionWithOptionalSingleArg
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):553:557 -> skipOptionWithSingleArg
-    1:3:void skipSingleArgument():615:617 -> skipSingleArgument
-    1:8:void skipWhitespace():1416:1423 -> skipWhitespace
-    1:10:java.lang.String snippetForPosition():1897:1906 -> snippetForPosition
-    11:17:java.lang.String snippetForPosition():1902:1908 -> snippetForPosition
-    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1913:1916 -> snippetForPosition
-    1:4:void unacceptString(java.lang.String):1781:1784 -> unacceptString
-    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):459:459 -> unknownOption
-    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464:466 -> unknownOption
+    11:13:boolean skipOptionWithClassSpec(java.lang.String):592 -> skipOptionWithClassSpec
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):569:575 -> skipOptionWithOptionalSingleArg
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):558:562 -> skipOptionWithSingleArg
+    1:3:void skipSingleArgument():620:622 -> skipSingleArgument
+    1:8:void skipWhitespace():1432:1439 -> skipWhitespace
+    1:10:java.lang.String snippetForPosition():1913:1922 -> snippetForPosition
+    11:17:java.lang.String snippetForPosition():1918:1924 -> snippetForPosition
+    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1929:1932 -> snippetForPosition
+    1:4:void unacceptString(java.lang.String):1797:1800 -> unacceptString
+    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):464:464 -> unknownOption
+    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469:471 -> unknownOption
     5:7:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> unknownOption
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):464 -> unknownOption
-    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):775:787 -> verifyAndLinkBackReferences
-    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):782:785 -> verifyAndLinkBackReferences
+    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):469 -> unknownOption
+    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):791:803 -> verifyAndLinkBackReferences
+    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):798:801 -> verifyAndLinkBackReferences
     18:20:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> verifyAndLinkBackReferences
-    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):782 -> verifyAndLinkBackReferences
-    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):789:791 -> verifyAndLinkBackReferences
-    1:2:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1947 -> warnIgnoringOptions
-    3:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1946:1946 -> warnIgnoringOptions
-    1:2:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1952 -> warnOverridingOptions
-    3:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1951:1951 -> warnOverridingOptions
-    1:6:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1962 -> warnUnusualCharacters
-    7:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1957:1957 -> warnUnusualCharacters
+    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):798 -> verifyAndLinkBackReferences
+    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):805:807 -> verifyAndLinkBackReferences
+    1:2:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1963 -> warnIgnoringOptions
+    3:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1962:1962 -> warnIgnoringOptions
+    1:2:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1968 -> warnOverridingOptions
+    3:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1967:1967 -> warnOverridingOptions
+    1:6:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1978 -> warnUnusualCharacters
+    7:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1973:1973 -> 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>
@@ -53021,162 +53253,164 @@
     1:1:java.lang.String toString():76:76 -> toString
 com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.RootSetBuilder:
     1:1:void <clinit>():62:62 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):96:96 -> <init>
-    2:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:100 -> <init>
-    36:36:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):105:105 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):97:97 -> <init>
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,java.lang.Iterable):67:101 -> <init>
+    37:37:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> <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):246:251 -> 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):411:412 -> 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):470:471 -> 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):503:504 -> a
-    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):661:661 -> a
+    1:6:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):248:253 -> 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):417:418 -> 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):476:477 -> 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):509:510 -> a
+    13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):667:667 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):661 -> a
-    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):661:661 -> a
-    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):891:891 -> a
-    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):899:899 -> a
-    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):838:858 -> addItemToSets
+    14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):667 -> a
+    15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):667:667 -> a
+    16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):897:897 -> a
+    17:17:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):905:905 -> a
+    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):844:864 -> 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):858 -> 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):864:867 -> 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):864 -> 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):870:873 -> addItemToSets
     27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):867 -> 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):868:873 -> 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):870:891 -> 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):873 -> 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):874:879 -> 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):876:897 -> addItemToSets
     56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> 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):891 -> 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):891:947 -> 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):941:941 -> addItemToSets
-    115:138: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):938:961 -> addItemToSets
-    139:152:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:972 -> addItemToSets
-    153:197: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):970:1014 -> addItemToSets
-    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):667:668 -> allRulesSatisfied
-    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):625:650 -> anyImplementedInterfaceMatchesImplementsRule
-    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):657:662 -> anySourceMatchesInheritanceRuleDirectly
-    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):593:605 -> anySuperTypeMatchesExtendsRule
-    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):159:159 -> 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):419:420 -> 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):455:456 -> 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):488:489 -> b
-    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):900:900 -> b
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():361:361 -> buildConsequentRootSet
+    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):897 -> 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):897:953 -> 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):947:947 -> 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):944:962 -> addItemToSets
+    134:148:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):959:973 -> addItemToSets
+    149:162:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):971:984 -> addItemToSets
+    163:207:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):982:1026 -> addItemToSets
+    1:2:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):673:674 -> allRulesSatisfied
+    1:26:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):631:656 -> anyImplementedInterfaceMatchesImplementsRule
+    1:6:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):663:668 -> anySourceMatchesInheritanceRuleDirectly
+    1:13:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):599:611 -> anySuperTypeMatchesExtendsRule
+    1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):160:160 -> 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):425:426 -> 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):461:462 -> 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):494:495 -> b
+    8:8:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):906:906 -> b
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():367:367 -> 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):903:903 -> c
-    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):709:709 -> containsAnnotation
-    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):713:717 -> containsAnnotation
-    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):725:725 -> containsAnnotation
-    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):733:737 -> containsAnnotation
+    1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):909:909 -> c
+    1:1:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexClass):715:715 -> containsAnnotation
+    2:6:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMethod):719:723 -> containsAnnotation
+    7:7:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedField):731:731 -> containsAnnotation
+    8:12:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):739:743 -> 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):810:810 -> f
-    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):811:811 -> g
-    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):795:804 -> includeDescriptor
+    1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
+    1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
+    1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):801:810 -> includeDescriptor
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> includeDescriptor
-    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):804 -> includeDescriptor
-    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):805:814 -> includeDescriptor
-    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):818:828 -> includeDescriptorClasses
-    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):788:789 -> markClass
+    11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):810 -> includeDescriptor
+    12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):811:820 -> includeDescriptor
+    1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> includeDescriptorClasses
+    1:2:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):794:795 -> 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):789 -> markClass
-    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):791:791 -> 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):776:779 -> markField
+    3:3:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):795 -> markClass
+    4:4:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):797:797 -> 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):782:785 -> 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):779 -> 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):782:782 -> 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):501:501 -> 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):468:468 -> 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):434:444 -> 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):785 -> 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):788:788 -> 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):507:507 -> 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):474:474 -> 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):440:450 -> markMatchingOverriddenMethods
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):444 -> 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):448:458 -> 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):483:491 -> markMatchingVisibleFields
-    1:24:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):399:422 -> 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):752:759 -> 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):450 -> 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):454:464 -> markMatchingOverriddenMethods
+    1:9:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):489:497 -> markMatchingVisibleFields
+    1:24:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):405:428 -> markMatchingVisibleMethods
+    1:8:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):758:765 -> markMethod
     9:9:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethod
-    9:9:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):759 -> 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):763:765 -> markMethod
-    1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):113:171 -> process
-    60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):148:167 -> process
-    80:157:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):141:218 -> process
-    158:158:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):207:207 -> process
-    159:161:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196:198 -> process
-    162:164:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> process
-    165:165:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):178:178 -> process
-    1:12:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):304:315 -> propagateAssumeRules
-    13:44:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):325:356 -> propagateAssumeRules
-    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):680:683 -> ruleSatisfied
-    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):698:700 -> ruleSatisfiedByFields
-    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):687:689 -> ruleSatisfiedByMethods
-    1:28:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):258:285 -> run
-    29:29:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):274:274 -> run
-    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:243 -> runPerRule
-    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):242:242 -> runPerRule
-    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):566:567 -> satisfyAccessFlag
-    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):571:571 -> satisfyAnnotation
-    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):562:562 -> satisfyClassType
-    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):583:588 -> satisfyExtendsRule
-    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):611:616 -> satisfyImplementsRule
-    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):575:579 -> satisfyInheritanceRule
-    1:10:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):378:387 -> testAndGetPrecondition
-    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):511:524 -> writeSeeds
-    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):519:544 -> writeSeeds
-    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):543:558 -> 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):765 -> markMethod
+    10:12:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):769:771 -> markMethod
+    1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):114:172 -> process
+    60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149:168 -> process
+    80:158:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):142:220 -> process
+    159:159:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):209:209 -> process
+    160:162:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):197:199 -> process
+    163:165:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):198:200 -> process
+    166:166:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):179:179 -> process
+    1:12:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):310:321 -> propagateAssumeRules
+    13:44:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):331:362 -> propagateAssumeRules
+    1:4:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):686:689 -> ruleSatisfied
+    1:3:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):704:706 -> ruleSatisfiedByFields
+    1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):693:695 -> ruleSatisfiedByMethods
+    1:24:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):260:283 -> run
+    25:33:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):282:290 -> run
+    34:34:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):276:276 -> run
+    1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230:245 -> runPerRule
+    17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):244:244 -> runPerRule
+    1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):572:573 -> satisfyAccessFlag
+    1:1:boolean satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):577:577 -> satisfyAnnotation
+    1:1:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):568:568 -> satisfyClassType
+    1:6:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):589:594 -> satisfyExtendsRule
+    1:6:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):617:622 -> satisfyImplementsRule
+    1:5:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):581:585 -> satisfyInheritanceRule
+    1:10:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):384:393 -> testAndGetPrecondition
+    1:14:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:530 -> writeSeeds
+    15:40:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> writeSeeds
+    41:56:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> writeSeeds
 com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.RootSetBuilder$1:
-    1:1:void <clinit>():974:974 -> <clinit>
-    2:2:void <clinit>():963:963 -> <clinit>
-    3:3:void <clinit>():952:952 -> <clinit>
-    4:4:void <clinit>():936:936 -> <clinit>
-    5:5:void <clinit>():138:138 -> <clinit>
+    1:1:void <clinit>():986:986 -> <clinit>
+    2:2:void <clinit>():975:975 -> <clinit>
+    3:3:void <clinit>():964:964 -> <clinit>
+    4:4:void <clinit>():942:942 -> <clinit>
+    5:5:void <clinit>():139:139 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.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,com.android.tools.r8.shaking.RootSetBuilder$1):1395:1395 -> <init>
-    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1411:1418 -> <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,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
+    2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.RootSetBuilder$RootSet:
-    1:1:void <clinit>():1018:1018 -> <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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1018:1018 -> <init>
-    2:22: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.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1062:1082 -> <init>
+    1:1:void <clinit>():1030:1030 -> <clinit>
+    1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$1):1030:1030 -> <init>
+    2:23:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set):1076:1097 -> <init>
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):153:153 -> a
-    1:1:void lambda$forEachDependentNonStaticMember$5(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):1165 -> a
-    2:4:void lambda$forEachDependentNonStaticMember$5(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):1167:1169 -> a
-    5:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1121:1122 -> a
-    7:7:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1122:1122 -> a
-    8:8:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1131:1131 -> a
-    9:10:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1131:1132 -> a
-    11:11:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1388:1388 -> a
-    1:6:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1114:1119 -> addConsequentRootSet
-    1:1:void addDependentItems(java.util.Map):1128:1128 -> addDependentItems
+    1:1:void lambda$forEachDependentNonStaticMember$5(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):1180 -> a
+    2:4:void lambda$forEachDependentNonStaticMember$5(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):1182:1184 -> a
+    5:6:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1136:1137 -> a
+    7:7:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1137:1137 -> a
+    8:8:java.util.Map lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1146:1146 -> a
+    9:10:void lambda$addDependentItems$3(com.android.tools.r8.graph.DexReference,java.util.Map):1146:1147 -> a
+    11:11:void lambda$toString$7(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1403:1403 -> a
+    1:6:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet):1129:1134 -> addConsequentRootSet
+    1:1:void addDependentItems(java.util.Map):1143:1143 -> addDependentItems
     1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):153:153 -> b
-    1:1:void lambda$forEachDependentStaticMember$4(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):1151 -> b
-    2:3:void lambda$forEachDependentStaticMember$4(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):1152:1153 -> b
-    4:4:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1308:1308 -> b
-    1:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1086:1097 -> checkAllRulesAreUsed
-    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094:1094 -> checkAllRulesAreUsed
+    1:1:void lambda$forEachDependentStaticMember$4(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):1166 -> b
+    2:3:void lambda$forEachDependentStaticMember$4(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):1167:1168 -> b
+    4:4:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> b
+    1:12:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1101:1112 -> checkAllRulesAreUsed
+    13:13:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109:1109 -> checkAllRulesAreUsed
     14:16:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> checkAllRulesAreUsed
-    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1094 -> checkAllRulesAreUsed
-    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1175:1188 -> copy
-    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1162:1163 -> forEachDependentNonStaticMember
-    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1148:1149 -> forEachDependentStaticMember
-    1:2:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1141 -> getDependentItems
-    3:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1140:1140 -> getDependentItems
-    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1136:1136 -> getDependentKeepClassCompatRule
-    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1275:1283 -> isKeptDirectlyOrIndirectly
-    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1210:1210 -> mayBeMinified
-    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1214:1216 -> mayNotBeMinified
-    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1215:1219 -> mayNotBeMinified
-    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1218:1223 -> mayNotBeMinified
-    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1222:1222 -> mayNotBeMinified
-    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1201:1202 -> move
-    1:5:void prune(com.android.tools.r8.graph.DexReference):1193:1197 -> prune
-    1:3:java.util.Map rewriteDependentReferenceKeys(java.util.Map,java.util.function.Function):1106:1108 -> rewriteDependentReferenceKeys
-    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1206:1206 -> shouldNotBeMinified
-    1:21:java.lang.String toString():1370:1390 -> toString
-    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1228:1231 -> verifyKeptFieldsAreAccessedAndLive
+    14:16:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1109 -> checkAllRulesAreUsed
+    1:14:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1190:1203 -> copy
+    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1177:1178 -> forEachDependentNonStaticMember
+    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1163:1164 -> forEachDependentStaticMember
+    1:2:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1156 -> getDependentItems
+    3:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1155:1155 -> getDependentItems
+    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1151:1151 -> getDependentKeepClassCompatRule
+    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1290:1298 -> isKeptDirectlyOrIndirectly
+    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> mayBeMinified
+    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1229:1231 -> mayNotBeMinified
+    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1230:1234 -> mayNotBeMinified
+    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1233:1238 -> mayNotBeMinified
+    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1237:1237 -> mayNotBeMinified
+    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1216:1217 -> move
+    1:5:void prune(com.android.tools.r8.graph.DexReference):1208:1212 -> prune
+    1:3:java.util.Map rewriteDependentReferenceKeys(java.util.Map,java.util.function.Function):1121:1123 -> rewriteDependentReferenceKeys
+    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1221:1221 -> shouldNotBeMinified
+    1:21:java.lang.String toString():1385:1405 -> toString
+    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1243:1246 -> verifyKeptFieldsAreAccessedAndLive
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> verifyKeptFieldsAreAccessedAndLive
-    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1233 -> verifyKeptFieldsAreAccessedAndLive
-    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1233:1237 -> verifyKeptFieldsAreAccessedAndLive
-    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1290:1362 -> verifyKeptItemsAreKept
-    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1245:1255 -> verifyKeptMethodsAreTargetedAndLive
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1264:1268 -> verifyKeptTypesAreLive
+    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1248 -> verifyKeptFieldsAreAccessedAndLive
+    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1248:1252 -> verifyKeptFieldsAreAccessedAndLive
+    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1305:1377 -> verifyKeptItemsAreKept
+    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1260:1270 -> verifyKeptMethodsAreTargetedAndLive
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> verifyKeptTypesAreLive
 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>
@@ -53296,17 +53530,17 @@
     1:25:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):112:136 -> pruneUnusedInterfaces
     1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):300:329 -> reachableFields
     1:15:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> reachableMethods
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> reachableMethods
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> reachableMethods
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> reachableMethods
     17:24:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> reachableMethods
     25:30:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> reachableMethods
-    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1038:1038 -> reachableMethods
+    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> reachableMethods
     32:54:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> reachableMethods
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> reachableMethods
-    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> reachableMethods
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> reachableMethods
+    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> reachableMethods
     55:55:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> reachableMethods
-    56:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> reachableMethods
+    56:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> reachableMethods
     56:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> reachableMethods
     58:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> reachableMethods
     1:2:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):65:66 -> removeUnused
@@ -53427,10 +53661,10 @@
     71:71:boolean com.android.tools.r8.graph.DexClass.isAbstract():589:589 -> merge
     71:71:boolean merge():974 -> merge
     72:74:boolean merge():975:977 -> merge
-    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():329:329 -> merge
-    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):633 -> merge
+    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> merge
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> merge
     75:75:boolean merge():977 -> merge
-    76:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):634:635 -> merge
+    76:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> merge
     76:77:boolean merge():977 -> merge
     78:104:boolean merge():979:1005 -> merge
     105:152:boolean merge():996:1043 -> merge
@@ -53615,6 +53849,16 @@
 com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath:
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.WhyAreYouNotInliningRule:
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
+    2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
+    1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> builder
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder:
+    1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$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.WhyAreYouNotInliningRule build():26:28 -> build
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():12:12 -> self
 com.android.tools.r8.utils.AarArchiveResourceProvider -> com.android.tools.r8.utils.a:
     com.android.tools.r8.origin.Origin origin -> a
     java.nio.file.Path archive -> b
@@ -53670,44 +53914,45 @@
     com.android.tools.r8.utils.AndroidApiLevel K -> m
     com.android.tools.r8.utils.AndroidApiLevel H_MR2 -> s
     com.android.tools.r8.utils.AndroidApiLevel I_MR1 -> q
-    1:30:void <clinit>():12:41 -> <clinit>
-    31:63:void <clinit>():11:43 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):47:48 -> <init>
-    1:1:com.android.tools.r8.utils.DexVersion getDexVersion():64:64 -> a
-    1:1:int getLevel():52:52 -> b
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):146:146 -> b
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):144:144 -> b
-    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):142:142 -> b
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):140:140 -> b
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):138:138 -> b
-    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):136:136 -> b
-    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):134:134 -> b
-    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):132:132 -> b
-    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):130:130 -> b
-    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):128:128 -> b
-    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):126:126 -> b
-    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):124:124 -> b
-    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):122:122 -> b
-    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):120:120 -> b
-    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):118:118 -> b
-    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):116:116 -> b
-    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):114:114 -> b
-    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):112:112 -> b
-    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):110:110 -> b
-    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):108:108 -> b
-    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):106:106 -> b
-    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):104:104 -> b
-    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):102:102 -> b
-    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):100:100 -> b
-    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):98:98 -> b
-    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):96:96 -> b
-    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):94:94 -> b
-    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):92:92 -> b
-    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):90:90 -> b
-    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):88:88 -> b
-    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):86:86 -> b
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():60:60 -> c
-    1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():11:11 -> d
+    1:30:void <clinit>():15:44 -> <clinit>
+    31:63:void <clinit>():14:46 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):50:51 -> <init>
+    1:1:com.android.tools.r8.utils.DexVersion getDexVersion():67:67 -> a
+    1:1:int getLevel():55:55 -> b
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):155:155 -> b
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):153:153 -> b
+    4:4:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):151:151 -> b
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):149:149 -> b
+    6:6:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):147:147 -> b
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):145:145 -> b
+    8:8:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):143:143 -> b
+    9:9:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):141:141 -> b
+    10:10:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):139:139 -> b
+    11:11:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):137:137 -> b
+    12:12:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):135:135 -> b
+    13:13:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):133:133 -> b
+    14:14:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):131:131 -> b
+    15:15:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):129:129 -> b
+    16:16:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):127:127 -> b
+    17:17:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):125:125 -> b
+    18:18:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):123:123 -> b
+    19:19:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):121:121 -> b
+    20:20:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):119:119 -> b
+    21:21:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):117:117 -> b
+    22:22:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):115:115 -> b
+    23:23:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):113:113 -> b
+    24:24:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):111:111 -> b
+    25:25:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):109:109 -> b
+    26:26:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):107:107 -> b
+    27:27:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):105:105 -> b
+    28:28:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):103:103 -> b
+    29:29:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):101:101 -> b
+    30:30:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):99:99 -> b
+    31:31:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
+    32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):95:95 -> b
+    1:2:java.util.List getAndroidApiLevelsSorted():71:72 -> c
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():63:63 -> d
+    1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():14:14 -> e
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.e:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.StringResource proguardMapOutputData -> f
@@ -54309,35 +54554,45 @@
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
 com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.K:
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
-    2:2:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):25:25 -> a
-    3:3:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25:25 -> a
-    4:8:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    4:8:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):25 -> a
-    9:9:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29:29 -> a
-    10:14:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):35:39 -> a
-    10:14:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):29 -> a
+    2:2:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):27:27 -> a
+    3:3:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27:27 -> a
+    4:8:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    4:8:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27 -> a
+    9:9:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31:31 -> a
+    10:14:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
+    10:14:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):31 -> a
     15:29:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],com.android.tools.r8.BaseCommand$Builder):33:47 -> a
-    30:40:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):65:75 -> a
-    41:41:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
-    42:44:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    42:44:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    45:45:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
-    46:48:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    46:48:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
-    49:49:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    50:52:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    50:52:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
-    53:53:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    54:60:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):104:110 -> a
-    54:60:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    61:61:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:67 -> a
-    62:64:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    62:64:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67 -> a
-    65:65:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):77:77 -> a
-    66:75:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):87:96 -> a
-    76:77:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):90:91 -> a
-    78:87:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):114:123 -> a
-    88:89:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):117:118 -> a
+    30:47:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):67:84 -> a
+    48:50:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):78:80 -> a
+    51:51:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    51:51:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    52:57:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    52:57:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    52:57:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    52:57:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    58:59:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    58:59:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80 -> a
+    60:62:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:82 -> a
+    63:63:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75:75 -> a
+    64:66:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    64:66:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75 -> a
+    67:67:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
+    68:70:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    68:70:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    71:71:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction) -> a
+    72:74:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    72:74:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
+    75:75:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    76:82:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):113:119 -> a
+    76:82:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    83:83:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    84:86:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    84:86:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69 -> a
+    87:87:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):86:86 -> a
+    88:97:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):96:105 -> a
+    98:99:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):99:100 -> a
+    100:109:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):123:132 -> a
+    110:111:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):126:127 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> b
     1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
@@ -54492,330 +54747,327 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.T:
-    int SUPPORTED_DEX_VERSION -> e1
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> S0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer configurationConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
     boolean quiet -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
     boolean enableRedundantConstNumberOptimization -> X
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> a1
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> J0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
     boolean enableClassInlining -> y
-    java.util.Set nullableReceiverInliningFilter -> i0
-    boolean skipReadingDexCode -> R0
+    java.util.List mainDexKeepRules -> J0
     boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean $assertionsDisabled -> f1
-    boolean forceProguardCompatibility -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableMinification -> A0
+    boolean printCfg -> A0
     boolean enableStringSwitchConversion -> Q
     boolean enableUnusedArgumentRemoval -> r
-    boolean enableTreeShaking -> z0
-    java.util.Map warningInvalidParameterAnnotations -> P0
+    boolean enableMinification -> z0
+    java.util.Map warningInvalidDebugInfo -> P0
+    boolean processCovariantReturnTypeAnnotations -> v0
     boolean enableClassStaticizer -> z
-    boolean enableGeneratedMessageLiteShrinking -> r0
+    boolean enableNestBasedAccessDesugaring -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
+    boolean enableLambdaMerging -> n0
+    int SUPPORTED_DEX_VERSION -> d1
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> T0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
     boolean invalidDebugInfoFatal -> c0
     boolean enableValuePropagation -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
-    java.util.List mainDexKeepRules -> K0
     java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
+    boolean minimalMainDex -> K0
     int inliningInstructionLimit -> N
+    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> N0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> c1
-    boolean printCfg -> B0
-    int minApiLevel -> k0
     boolean enableUninstantiatedTypeOptimization -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> X0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> b1
-    boolean processCovariantReturnTypeAnnotations -> w0
-    boolean enableNestBasedAccessDesugaring -> s0
-    java.util.Map missingEnclosingMembers -> O0
-    java.util.Set reportedMissingForDesugaring -> d1
+    boolean lookupLibraryBeforeProgram -> w0
+    boolean enableNestReduction -> s0
+    java.util.Map warningInvalidParameterAnnotations -> O0
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableLambdaMerging -> o0
+    boolean enableDesugaring -> o0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
     boolean ignoreMainDexMissingClasses -> d0
     int inliningInstructionAllowance -> O
-    java.lang.String printCfgFile -> C0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> U0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
     boolean enableNonNullTracking -> u
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> Y0
     com.android.tools.r8.utils.Reporter reporter -> c
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Z0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
     java.util.Set extensiveLoggingFilter -> g0
-    boolean minimalMainDex -> L0
-    boolean skipIR -> H0
+    boolean enableInheritanceClassInDexDistributor -> L0
+    boolean debug -> H0
     boolean enableDeterminismAnalysis -> C
     int inliningControlFlowResolutionBlocksThreshold -> P
+    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    boolean configurationDebugging -> G0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
+    boolean skipIR -> G0
+    boolean ignoreMissingClasses -> C0
     boolean enableRedundantFieldLoadElimination -> U
     boolean enableInlining -> v
-    boolean lookupLibraryBeforeProgram -> x0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> v0
-    boolean enableNestReduction -> t0
-    boolean enableDesugaring -> p0
+    int minApiLevel -> j0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
+    boolean enableGeneratedExtensionRegistryShrinking -> p0
+    java.util.List logArgumentsFilter -> m0
+    java.util.Map missingEnclosingMembers -> N0
     int numberOfThreads -> Y
-    boolean intermediate -> l0
+    boolean readCompileTimeAnnotations -> l0
+    java.util.Set reportedMissingForDesugaring -> c1
+    java.util.List methodsFilter -> i0
     boolean enableServiceLoaderRewriting -> D
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
     boolean hasMarker -> e0
     boolean verbose -> a0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> V0
+    com.android.tools.r8.StringConsumer configurationConsumer -> V0
+    java.lang.String printCfgFile -> B0
     com.android.tools.r8.dex.Marker marker -> f0
     boolean enableEnumValueOptimization -> R
     boolean enableUnusedInterfaceRemoval -> s
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> F0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
     boolean useSmaliSyntax -> Z
-    boolean enableInheritanceClassInDexDistributor -> M0
+    boolean skipReadingDexCode -> Q0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
-    boolean debug -> I0
-    boolean ignoreMissingClasses -> D0
+    boolean $assertionsDisabled -> e1
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    boolean enableMainDexListCheck -> y0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> u0
+    boolean enableTreeShaking -> y0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    java.util.List logArgumentsFilter -> n0
-    java.util.Map warningInvalidDebugInfo -> Q0
-    boolean enableGeneratedExtensionRegistryShrinking -> q0
-    java.util.List methodsFilter -> j0
-    boolean readCompileTimeAnnotations -> m0
+    boolean enableGeneratedMessageLiteShrinking -> q0
     boolean enableSideEffectAnalysis -> B
-    1:23:void <clinit>():65:87 -> <clinit>
-    1:1:void <init>():111:111 -> <init>
-    2:522:void <init>():105:625 -> <init>
-    523:527:void <init>():112:116 -> <init>
-    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:120 -> <init>
-    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:128 -> <init>
-    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:132 -> <init>
-    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):105:625 -> <init>
-    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:144 -> <init>
-    1:1:boolean hasProguardConfiguration():94:94 -> A
-    1:1:boolean hasUsageInformationConsumer():582:582 -> B
-    1:1:boolean isDesugaredLibraryCompilation():308:308 -> C
-    1:1:boolean isGeneratingClassFiles():329:329 -> D
-    1:1:boolean isGeneratingDexIndexed():321:321 -> E
-    1:1:boolean isGeneratingDex():317 -> E
-    2:2:boolean isGeneratingDexFilePerClassFile():325:325 -> E
-    2:2:boolean isGeneratingDex():317 -> E
-    1:1:boolean hasConsumer():292:292 -> F
+    1:23:void <clinit>():66:88 -> <clinit>
+    1:1:void <init>():112:112 -> <init>
+    2:520:void <init>():106:624 -> <init>
+    521:525:void <init>():113:117 -> <init>
+    526:526:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    527:1045:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1046:1053:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1054:1054:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1055:1573:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:624 -> <init>
+    1574:1585:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean hasProguardConfiguration():95:95 -> A
+    1:1:boolean hasUsageInformationConsumer():581:581 -> B
+    1:1:boolean isDesugaredLibraryCompilation():309:309 -> C
+    1:1:boolean isGeneratingClassFiles():330:330 -> D
+    1:1:boolean isGeneratingDexIndexed():322:322 -> E
+    1:1:boolean isGeneratingDex():318 -> E
+    2:2:boolean isGeneratingDexFilePerClassFile():326:326 -> E
+    2:2:boolean isGeneratingDex():318 -> E
+    1:1:boolean hasConsumer():293:293 -> F
     1:1:boolean isInterfaceMethodDesugaringEnabled():1065 -> F
     2:4:boolean isInterfaceMethodDesugaringEnabled():1068:1070 -> F
-    1:1:boolean isMinifying():426:426 -> G
+    1:1:boolean isMinifying():425:425 -> G
     1:1:boolean isProtoShrinkingEnabled():1078:1078 -> H
-    1:1:boolean isShrinking():422:422 -> I
+    1:1:boolean isShrinking():421:421 -> I
     1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> J
-    1:32:boolean printWarnings():800:831 -> K
-    33:72:boolean printWarnings():827:866 -> K
-    1:4:boolean shouldDesugarNests():364:367 -> L
-    5:5:boolean isGeneratingClassFiles():329:329 -> L
+    1:32:boolean printWarnings():799:830 -> K
+    33:72:boolean printWarnings():826:865 -> K
+    1:4:boolean shouldDesugarNests():365:368 -> L
+    5:5:boolean isGeneratingClassFiles():330:330 -> L
     5:5:boolean canUseNestBasedAccess():1048 -> L
-    5:5:boolean shouldDesugarNests():367 -> L
-    1:13:void signalFinishedToConsumers():345:357 -> M
-    1:1:boolean assertionsEnabled():620:620 -> N
-    1:9:java.util.Set getExtensiveFieldMinifierLoggingFilter():474:482 -> O
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():487:495 -> P
-    1:9:java.util.Set getExtensiveLoggingFilter():461:469 -> Q
-    1:31:java.util.Set getNullableReceiverInliningFilter():499:529 -> R
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():457:457 -> S
+    5:5:boolean shouldDesugarNests():368 -> L
+    1:13:void signalFinishedToConsumers():346:358 -> M
+    1:1:boolean assertionsEnabled():619:619 -> N
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():486:494 -> O
+    1:9:java.util.Set getExtensiveLoggingFilter():460:468 -> P
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():456:456 -> Q
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):262:263 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):267:268 -> a
-    5:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):275:281 -> a
-    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    12:12:boolean isGeneratingClassFiles():329:329 -> a
-    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):282 -> a
-    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    13:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283:286 -> a
-    13:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270 -> a
-    17:17:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> a
-    18:18:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> a
-    19:25:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:750 -> a
-    26:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:745 -> a
-    27:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:758 -> a
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):263:264 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):268:269 -> a
+    5:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):276:282 -> a
+    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    12:12:boolean isGeneratingClassFiles():330:330 -> a
+    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):283 -> a
+    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    13:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):284:287 -> a
+    13:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):271 -> a
+    17:17:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> a
+    18:18:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> a
+    19:25:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):743:749 -> a
+    26:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):744:744 -> a
+    27:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):756:757 -> a
     29:29:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760 -> a
-    30:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):760:762 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759 -> a
+    30:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:761 -> a
     33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
     35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766:766 -> a
-    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:758 -> a
-    38:41:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):771:774 -> a
-    42:46:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):779:783 -> a
-    47:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:794 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:789 -> a
-    55:55:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):793:793 -> a
-    56:61:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):880:885 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765:765 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):757:757 -> a
+    38:41:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):770:773 -> a
+    42:46:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):778:782 -> a
+    47:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):787:793 -> a
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788:788 -> a
+    55:55:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):792:792 -> a
+    56:61:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):879:884 -> a
     62:63:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1019:1020 -> a
     64:64:boolean canHaveArtCheckCastVerifierBug():1399:1399 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639:642 -> b
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):638:641 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644:646 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):642:642 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640 -> b
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):666:666 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:645 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641:641 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):639 -> b
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> b
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667 -> b
-    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668:670 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:676 -> b
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):666 -> b
+    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:669 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):674:675 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678:678 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):782:782 -> b
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675:675 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):781:781 -> b
     25:26:boolean canHaveArtInstanceOfVerifierBug():1354:1355 -> b
-    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:635 -> c
-    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):628:628 -> c
-    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633 -> c
-    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> c
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):631:634 -> c
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):627:627 -> c
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632 -> c
+    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):653:653 -> c
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> c
-    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655 -> c
-    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656:656 -> c
-    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):650:650 -> c
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):657 -> c
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):738:738 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661:661 -> c
-    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):773:773 -> c
+    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654 -> c
+    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:655 -> c
+    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):649:649 -> c
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656 -> c
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):737:737 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
+    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):772:772 -> c
     14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1431:1431 -> c
-    1:1:boolean isGeneratingClassFiles():329:329 -> d
+    1:1:boolean isGeneratingClassFiles():330:330 -> d
     1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445 -> d
     2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1445:1445 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):684:686 -> d
-    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):700:705 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):683:685 -> d
+    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):699:704 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):705 -> d
-    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):707:734 -> d
-    1:1:boolean isGeneratingClassFiles():329:329 -> e
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704 -> d
+    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706:733 -> d
+    1:1:boolean isGeneratingClassFiles():330:330 -> e
     1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101 -> e
     2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1101:1101 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):693:695 -> e
-    1:1:boolean isGeneratingClassFiles():329:329 -> f
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):692:694 -> e
+    1:1:boolean isGeneratingClassFiles():330:330 -> f
     1:1:boolean canLeaveStaticInterfaceMethodInvokes():1052 -> f
     2:2:boolean canLeaveStaticInterfaceMethodInvokes():1052:1052 -> f
-    1:1:boolean isGeneratingClassFiles():329:329 -> g
+    1:1:boolean isGeneratingClassFiles():330:330 -> g
     1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1091 -> g
     2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1091:1091 -> g
-    1:1:boolean isGeneratingClassFiles():329:329 -> h
+    1:1:boolean isGeneratingClassFiles():330:330 -> h
     1:1:boolean canUseConstantMethodHandle():1032 -> h
     2:2:boolean canUseConstantMethodHandle():1032:1032 -> h
-    1:1:boolean isGeneratingClassFiles():329:329 -> i
+    1:1:boolean isGeneratingClassFiles():330:330 -> i
     1:1:boolean canUseConstantMethodType():1036 -> i
     2:2:boolean canUseConstantMethodType():1036:1036 -> i
-    1:1:boolean isGeneratingClassFiles():329:329 -> j
+    1:1:boolean isGeneratingClassFiles():330:330 -> j
     1:1:boolean canUseDefaultAndStaticInterfaceMethods():1044 -> j
     2:2:boolean canUseDefaultAndStaticInterfaceMethods():1044:1044 -> j
     1:2:boolean canUseFilledNewArrayOfObjects():1113:1114 -> k
-    1:1:boolean isGeneratingClassFiles():329:329 -> l
+    1:1:boolean isGeneratingClassFiles():330:330 -> l
     1:1:boolean canUseInvokeCustom():1040 -> l
     2:2:boolean canUseInvokeCustom():1040:1040 -> l
-    1:1:boolean isGeneratingClassFiles():329:329 -> m
+    1:1:boolean isGeneratingClassFiles():330:330 -> m
     1:1:boolean canUseInvokePolymorphic():1028 -> m
     2:2:boolean canUseInvokePolymorphic():1028:1028 -> m
-    1:1:boolean isGeneratingClassFiles():329:329 -> n
+    1:1:boolean isGeneratingClassFiles():330:330 -> n
     1:1:boolean canUseInvokePolymorphicOnVarHandle():1024 -> n
     2:2:boolean canUseInvokePolymorphicOnVarHandle():1024:1024 -> n
     1:2:boolean canUseMultidex():1082:1083 -> o
-    1:1:boolean isGeneratingClassFiles():329:329 -> p
+    1:1:boolean isGeneratingClassFiles():330:330 -> p
     1:1:boolean canUseNotInstruction():1149 -> p
     2:2:boolean canUseNotInstruction():1149:1149 -> p
-    1:1:boolean isGeneratingClassFiles():329:329 -> q
+    1:1:boolean isGeneratingClassFiles():330:330 -> q
     1:1:boolean canUsePrivateInterfaceMethods():1060 -> q
     2:2:boolean canUsePrivateInterfaceMethods():1060:1060 -> q
     1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1122:1123 -> r
-    1:1:boolean isGeneratingClassFiles():329:329 -> s
+    1:1:boolean isGeneratingClassFiles():330:330 -> s
     1:1:boolean canUseSuppressedExceptions():1087 -> s
     2:2:boolean canUseSuppressedExceptions():1087:1087 -> s
-    1:1:boolean isGeneratingClassFiles():329:329 -> t
+    1:1:boolean isGeneratingClassFiles():330:330 -> t
     1:1:boolean canUseTwrCloseResourceMethod():1056 -> t
     2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> t
-    1:4:void disableAllOptimizations():148:151 -> u
-    1:17:void disableGlobalOptimizations():155:171 -> v
+    1:4:void disableAllOptimizations():149:152 -> u
+    1:17:void disableGlobalOptimizations():156:172 -> v
     1:1:void disableNameReflectionOptimization():1015:1015 -> w
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> x
-    2:2:boolean hasConsumer():292:292 -> x
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296 -> x
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():296:296 -> x
-    4:4:boolean isGeneratingDexIndexed():321:321 -> x
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> x
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298:298 -> x
-    6:6:boolean isGeneratingDexFilePerClassFile():325:325 -> x
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> x
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300:300 -> x
-    8:8:boolean isGeneratingClassFiles():329:329 -> x
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301 -> x
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:304 -> x
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():98:98 -> y
-    1:1:boolean hasMethodsFilter():875:875 -> z
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> x
+    2:2:boolean hasConsumer():293:293 -> x
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297 -> x
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():297:297 -> x
+    4:4:boolean isGeneratingDexIndexed():322:322 -> x
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():298 -> x
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> x
+    6:6:boolean isGeneratingDexFilePerClassFile():326:326 -> x
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> x
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> x
+    8:8:boolean isGeneratingClassFiles():330:330 -> x
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> x
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:305 -> x
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> y
+    1:1:boolean hasMethodsFilter():874:874 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.T$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing ENABLE -> c
-    1:5:void <clinit>():78:82 -> <clinit>
-    1:1:void <init>(java.lang.String,int):76:76 -> <init>
+    1:5:void <clinit>():79:83 -> <clinit>
+    1:1:void <init>(java.lang.String,int):77:77 -> <init>
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.T$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):539:542 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.T$c:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():72:73 -> <clinit>
-    1:1:void <init>(java.lang.String,int):71:71 -> <init>
+    1:2:void <clinit>():73:74 -> <clinit>
+    1:1:void <init>(java.lang.String,int):72:72 -> <init>
 com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.T$d:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():907:915 -> <init>
+    1:9:void <init>():906:914 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.T$e:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():900:904 -> <clinit>
-    6:6:void <clinit>():898:898 -> <clinit>
-    1:1:void <init>(java.lang.String,int):898:898 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():898:898 -> a
+    1:5:void <clinit>():899:903 -> <clinit>
+    6:6:void <clinit>():897:897 -> <clinit>
+    1:1:void <init>(java.lang.String,int):897:897 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():897:897 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.T$f:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> H
     boolean enableDeadSwitchCaseElimination -> i
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -54823,17 +55075,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean allowOutlinerInterfaceArrayArguments -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean measureProguardIfRuleEvaluations -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean verifyKeptGraphInfo -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> F
     boolean forceJumboStringProcessing -> p
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -54841,12 +55092,14 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
-    boolean enableForceNestBasedAccessDesugaringForTest -> B
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
-    boolean readInputStackMaps -> D
-    1:84:void <init>():918:1001 -> <init>
+    java.io.PrintStream whyAreYouNotInliningConsumer -> B
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():917:1001 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.T$f$a:
     java.util.Comparator interfaceMethodOrdering -> a
     1:3:void <init>():987:989 -> <init>
@@ -54859,7 +55112,7 @@
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.T$g:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):551:553 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.U:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -54941,7 +55194,7 @@
     276:289:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):305:318 -> a
     290:290:void sortMethods(java.util.List):327:327 -> a
     291:292:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1075 -> a
+    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1097:1097 -> a
     293:293:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
     294:294:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
     295:301:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:362 -> a